1. 15 Mar, 2012 2 commits
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'cus/stable' · a04a97bc
      Michael Niedermayer authored
      * cus/stable:
        ffplay: force video refresh if the window is resized or damaged
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      a04a97bc
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · 67235dfa
      Michael Niedermayer authored
      * qatar/master:
        h264: stricter reference limit enforcement.
        h264: increase reference poc list from 16 to 32.
        xa_adpcm: limit filter to prevent xa_adpcm_table[] array bounds overruns.
        snow: check reference frame indices.
        snow: reject unsupported chroma shifts.
        Add ffvhuff encoding and decoding regression test
        anm: convert to bytestream2 API
        bytestream: add more unchecked variants for bytestream2 API
        jvdec: unbreak video decoding
        jv demux: set video stream duration
        fate: add pam image regression test
      
      Conflicts:
      	libavcodec/adpcm.c
      	libavcodec/anm.c
      	libavcodec/h264.c
      	libavcodec/mpegvideo.h
      	libavcodec/snowdec.c
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      67235dfa
  2. 14 Mar, 2012 19 commits
  3. 13 Mar, 2012 19 commits