[FFmpeg-cvslog] Merge commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d'
Michael Niedermayer
git at videolan.org
Fri Jun 12 21:05:00 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun 12 20:57:37 2015 +0200| [218f58a16a3dd6c1b3eecef18bb45c04439c7799] | committer: Michael Niedermayer
Merge commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d'
* commit 'e3d0f49abb20a551bf6d885f75c354d6d0bbeb9d':
mpegvideo: h263: Move all tables to a single file
Conflicts:
libavcodec/h263.h
libavcodec/h263data.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=218f58a16a3dd6c1b3eecef18bb45c04439c7799
---
More information about the ffmpeg-cvslog
mailing list