[FFmpeg-cvslog] Merge commit '21710ea82118c9d19bea9277b2a85a33096fdd95'
Michael Niedermayer
git at videolan.org
Mon Dec 2 23:03:39 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec 2 20:24:02 2013 +0100| [b58c1dd63268e6805fd3423bdecb8f4530e1cae2] | committer: Michael Niedermayer
Merge commit '21710ea82118c9d19bea9277b2a85a33096fdd95'
* commit '21710ea82118c9d19bea9277b2a85a33096fdd95':
dv: Move DV VLC data tables out of header file
Conflicts:
libavcodec/dv_vlc_data.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b58c1dd63268e6805fd3423bdecb8f4530e1cae2
---
More information about the ffmpeg-cvslog
mailing list