ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Tue Aug 26
12:40:32 2014 +0200| [ba650ea11825fdf7df479313bfca2a1003ffd90e] | committer:
Michael Niedermayer
Merge commit 'a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e'
* commit 'a4d3c20035946cbc1509aec2dc28d51c2a2f9a8e':
vc1: Fix the skip condition
Conflicts:
libavcodec/vc1_parser.c
See: ede411dd03950b91c6346f2a3ae0e7546555f42f
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba650ea11825fdf7df479313bfca2a1003ffd90e
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
