diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 23:53:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-29 23:55:00 +0100 |
| commit | 26b526e776a4ee7b88775f12c75b0a87fcc0e8e4 (patch) | |
| tree | f736f167b26a1e4da7a949bc7c41a6140d52c6c3 /libavcodec/vc1.c | |
| parent | f5d6541ba0d279955a2df798646e30370d85458a (diff) | |
| parent | a5a71992cae34b321ceb8374f44ce17a945a3881 (diff) | |
| download | ffmpeg-streaming-26b526e776a4ee7b88775f12c75b0a87fcc0e8e4.zip ffmpeg-streaming-26b526e776a4ee7b88775f12c75b0a87fcc0e8e4.tar.gz | |
Merge commit 'a5a71992cae34b321ceb8374f44ce17a945a3881'
* commit 'a5a71992cae34b321ceb8374f44ce17a945a3881':
mpeg4videoenc: don't set MpegEncContext.resync_marker
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1.c')
0 files changed, 0 insertions, 0 deletions
