Merge remote-tracking branch 'ffmpeg-mt/master'
authorAlexander Strange <astrange@ithinksw.com>
Sun, 17 Apr 2011 22:47:35 +0000 (00:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Apr 2011 22:47:35 +0000 (00:47 +0200)
commit7e2eb4bacd70541702bd086ab2a39cb7653d314e
tree45898e55103fffe67ebe5a5454522688fd40cdca
parent2d2b5a1421ee652f76a756024d0210f0b6455fda
Merge remote-tracking branch 'ffmpeg-mt/master'

    * ffmpeg-mt/master:
      Release unused pictures even when not calling ff_h264_frame_start()
      h264: Fix decoding race condition with PAFF
      h264: cosmetic whitespace change
    Duplicate  Fix REBASE_PICTURE with h.264
    Not pulled  Update test scripts to use ffmpeg instead of ffmpeg_g
    Duplicate  Fix ffmpeg-mt fixme in h264

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h