git.videolan.org Git - ffmpeg.git/rss log

Les articles publiés sur le site

• Merge remote-tracking branch ’qatar/master’

  6 août 2013, par Michael Niedermayer

  Merge remote-tracking branch 'qatar/master'
  
  * qatar/master:
    pcm_bluray: Return AVERROR_INVALIDDATA instead of -1 on header errors
  
  Conflicts:
  	libavcodec/pcm-mpeg.c
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] libavcodec/pcm-mpeg.c

• Merge commit ’6fb65973c9501d3fe94a5a9195c01cd20083066e’

  6 août 2013, par Michael Niedermayer

  Merge commit '6fb65973c9501d3fe94a5a9195c01cd20083066e'
  
  * commit '6fb65973c9501d3fe94a5a9195c01cd20083066e':
    configure: Properly split dv1394 indev dependencies
  
  Conflicts:
  	configure
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] configure

• Merge commit ’61c31e4ee7ea79a9e74c0476b81244febf17e6d7’

  6 août 2013, par Michael Niedermayer

  Merge commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7'
  
  * commit '61c31e4ee7ea79a9e74c0476b81244febf17e6d7':
    configure: Properly set zlib dependencies for all components
  
  Conflicts:
  	configure
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] configure

• Merge commit ’a7d45e06e9757f49ea4e105cbefc3462a7324e9a’

  6 août 2013, par Michael Niedermayer

  Merge commit 'a7d45e06e9757f49ea4e105cbefc3462a7324e9a'
  
  * commit 'a7d45e06e9757f49ea4e105cbefc3462a7324e9a':
    configure: The W64 demuxer should select the WAV demuxer, not depend on it
  
  Conflicts:
  	configure
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] configure

• Merge commit ’406e6c0ba5393fa302080202fe77bd09187889a1’

  6 août 2013, par Michael Niedermayer

  Merge commit '406e6c0ba5393fa302080202fe77bd09187889a1'
  
  * commit '406e6c0ba5393fa302080202fe77bd09187889a1':
    configure: Properly split avserver component and system dependencies
  
  Conflicts:
  	configure
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] configure