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)
commit6e9f3f3b6522a8c1440bab66c8a2d85791fd12f7
tree502e9b517e24b857069884bda22575eaf9c2779c
parentfadf845973aeb47d1b0bf3eac552394fd8a71437
parent238614de679a71970c20d7c3fee08a322967ec40
Merge commit '238614de679a71970c20d7c3fee08a322967ec40'

* 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>
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