Merge commit '238614de679a71970c20d7c3fee08a322967ec40'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Feb 2013 13:53:49 +0000 (14:53 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Feb 2013 13:53:49 +0000 (14:53 +0100)
* commit '238614de679a71970c20d7c3fee08a322967ec40':
  cdgraphics: do not rely on get_buffer() initializing the frame.
  svq1: replace struct svq1_frame_size with an array.
  vf_yadif: silence a warning.

Conflicts:
libavcodec/svq1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
cmdutils.c
libavcodec/cdgraphics.c
libavcodec/svq1.c
libavcodec/svq1.h
libavcodec/svq1dec.c
libavfilter/vf_yadif.c
libavfilter/x86/vf_yadif_init.c
libavfilter/yadif.h
tests/ref/fate/cdgraphics

diff --cc cmdutils.c
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -575,8 -579,8 +575,8 @@@ static int svq1_decode_frame_header(AVC
                  return AVERROR_INVALIDDATA;
          } else {
              /* get width, height from table */
-             width  = ff_svq1_frame_size_table[frame_size_code].width;
-             height = ff_svq1_frame_size_table[frame_size_code].height;
 -            s->width  = ff_svq1_frame_size_table[frame_size_code][0];
 -            s->height = ff_svq1_frame_size_table[frame_size_code][1];
++            width  = ff_svq1_frame_size_table[frame_size_code][0];
++            height = ff_svq1_frame_size_table[frame_size_code][1];
          }
      }
  
Simple merge
Simple merge
Simple merge
Simple merge