[FFmpeg-cvslog] Merge commit 'ac1fc92ea410c396594fcd79f5d4491fe6a8cc90'
Michael Niedermayer
git at videolan.org
Fri Dec 6 04:01:08 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 6 03:55:12 2013 +0100| [dfd11eb2a5404d2b59073ebb8433f25c51ca084b] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dfd11eb2a5404d2b59073ebb8433f25c51ca084b
---
More information about the ffmpeg-cvslog
mailing list