Merge commit 'ac1fc92ea410c396594fcd79f5d4491fe6a8cc90'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 02:55:12 +0000 (03:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 02:55:12 +0000 (03:55 +0100)
commitdfd11eb2a5404d2b59073ebb8433f25c51ca084b
treeba28970fa92e3acbfc20b0b8b005270e2bacd4e4
parent52b69fa142cb445c191852a9f9d9dcddf80e95e4
parentac1fc92ea410c396594fcd79f5d4491fe6a8cc90
Merge commit 'ac1fc92ea410c396594fcd79f5d4491fe6a8cc90'

* commit 'ac1fc92ea410c396594fcd79f5d4491fe6a8cc90':
  vc1dec: move setting repeat_pict after frame_start() has been called.

Conflicts:
libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vc1dec.c