[FFmpeg-cvslog] Merge commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4'
Michael Niedermayer
git at videolan.org
Fri Nov 15 12:57:38 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 15 12:32:37 2013 +0100| [e28130bcaf48281b431ea611a546e7520bb90dda] | committer: Michael Niedermayer
Merge commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4'
* commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4':
dv: Split DV data table declarations into their own header
Conflicts:
libavcodec/dvdata.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e28130bcaf48281b431ea611a546e7520bb90dda
---
More information about the ffmpeg-cvslog
mailing list