[FFmpeg-cvslog] Merge commit '38f64c03301ac66d7b54b3e4bd2bf6454f9fb2d3'
Michael Niedermayer
git at videolan.org
Fri Aug 16 13:19:16 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 16 13:13:58 2013 +0200| [dbcee7cc5c26fd6bf5007076493f9d9c81c5bf8c] | committer: Michael Niedermayer
Merge commit '38f64c03301ac66d7b54b3e4bd2bf6454f9fb2d3'
* commit '38f64c03301ac66d7b54b3e4bd2bf6454f9fb2d3':
mpeg12decdata.h: Move all tables to the only place they are used
Conflicts:
libavcodec/mpeg12decdata.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dbcee7cc5c26fd6bf5007076493f9d9c81c5bf8c
---
More information about the ffmpeg-cvslog
mailing list