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

Les articles publiés sur le site

• Merge commit ’794ca87d2bff2513118de8b97595b3e23070e67d’

  29 mai 2013, par Michael Niedermayer

  Merge commit '794ca87d2bff2513118de8b97595b3e23070e67d'
  
  * commit '794ca87d2bff2513118de8b97595b3e23070e67d':
    wvdec: split block header parsing into a separate file
  
  Conflicts:
  	libavformat/Makefile
  	libavformat/wvdec.c
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] libavformat/Makefile
  • [DH] libavformat/wv.c
  • [DH] libavformat/wv.h
  • [DH] libavformat/wvdec.c

• Merge commit ’0a1a94450a28eef854162f859e79ecfb9f97915b’

  29 mai 2013, par Michael Niedermayer

  Merge commit '0a1a94450a28eef854162f859e79ecfb9f97915b'
  
  * commit '0a1a94450a28eef854162f859e79ecfb9f97915b':
    lavf: rename wv.c to wvdec.c
  
  Conflicts:
  	libavformat/Makefile
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] libavformat/Makefile
  • [DH] libavformat/wvdec.c

• Merge commit ’89806691b1c39181c63d95e0fddc30f11e2a7b04’

  29 mai 2013, par Michael Niedermayer

  Merge commit '89806691b1c39181c63d95e0fddc30f11e2a7b04'
  
  * commit '89806691b1c39181c63d95e0fddc30f11e2a7b04':
    wavpack: check that all the channels were coded.
    wavpack: check that there aren't too many blocks per packet
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] libavcodec/wavpack.c

• Merge commit ’7d039e70a5ff23a7deaa866684d2e8872acc5169’

  29 mai 2013, par Michael Niedermayer

  Merge commit '7d039e70a5ff23a7deaa866684d2e8872acc5169'
  
  * commit '7d039e70a5ff23a7deaa866684d2e8872acc5169':
    wavpack: extract channel information from the bitstream
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] libavcodec/wavpack.c

• Merge commit ’78f75b6fa421dd39a715588e9487579f1ce5bada’

  29 mai 2013, par Michael Niedermayer

  Merge commit '78f75b6fa421dd39a715588e9487579f1ce5bada'
  
  * commit '78f75b6fa421dd39a715588e9487579f1ce5bada':
    wavpack: extract sample rate from the bitstream
    configure: support gcc-4.8 instrumentation
  
  Conflicts:
  	libavcodec/wavpack.c
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] configure
  • [DH] libavcodec/wavpack.c