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

Les articles publiés sur le site

• Merge commit ’a90905db2e6ab1840890f3a88bfd3bf008b9d886’

  16 octobre 2013, par Michael Niedermayer

  Merge commit 'a90905db2e6ab1840890f3a88bfd3bf008b9d886'
  
  * commit 'a90905db2e6ab1840890f3a88bfd3bf008b9d886':
    ffv1: Assume bitdepth 0 means 8bit
  
  Conflicts:
  	libavcodec/ffv1dec.c
  
  Note, FFmpeg is not affected by this bug
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

• Merge commit ’a84616b736fca5ebd6b87489dd41bc06ccdf7860’

  16 octobre 2013, par Michael Niedermayer

  Merge commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860'
  
  * commit 'a84616b736fca5ebd6b87489dd41bc06ccdf7860':
    mpegvideo: K&R formatting cosmetics
  
  Conflicts:
  	libavcodec/mpegvideo_motion.c
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] libavcodec/mpegvideo_motion.c

• Merge commit ’93f305473f880729d18b5e42067f19d2106cb2e5’

  16 octobre 2013, par Michael Niedermayer

  Merge commit '93f305473f880729d18b5e42067f19d2106cb2e5'
  
  * commit '93f305473f880729d18b5e42067f19d2106cb2e5':
    lavc: Convert some remaining strides to ptrdiff_t
  
  Conflicts:
  	libavcodec/h264.h
  	libavcodec/mpegvideo_enc.c
  	libavcodec/mpegvideo_motion.c
  	libavcodec/vp56.c
  	libavcodec/wmv2.c
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] libavcodec/h264.h
  • [DH] libavcodec/mpegvideo_enc.c
  • [DH] libavcodec/mpegvideo_motion.c
  • [DH] libavcodec/vp3.c
  • [DH] libavcodec/vp56.c

• Merge commit ’4baba6c813b7a1f27370e20fb1a87b05fcb39208’

  16 octobre 2013, par Michael Niedermayer

  Merge commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208'
  
  * commit '4baba6c813b7a1f27370e20fb1a87b05fcb39208':
    h264_parser: Fix POC parsing for the case where MMCO_RESET is present.
  
  Conflicts:
  	libavcodec/h264.c
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] libavcodec/h264.c
  • [DH] libavcodec/h264.h
  • [DH] libavcodec/h264_parser.c

• Merge commit ’b81dbd6cb7522bea96d78a52f8a4c25a47b820c9’

  16 octobre 2013, par Michael Niedermayer

  Merge commit 'b81dbd6cb7522bea96d78a52f8a4c25a47b820c9'
  
  * commit 'b81dbd6cb7522bea96d78a52f8a4c25a47b820c9':
    h264_parser: Fix POC parsing for the case where MMCO_RESET is absent.
  
  Merged-by: Michael Niedermayer <michaelni@gmx.at>
  

  • [DH] libavcodec/h264_parser.c