[FFmpeg-cvslog] Merge commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9'
Michael Niedermayer
git at videolan.org
Mon Nov 4 11:50:28 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 4 11:41:55 2013 +0100| [ab71be091206a2264f3a8862215fc284bb8e6274] | committer: Michael Niedermayer
Merge commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9'
* commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9':
lavc: move AVCodecContext.pkt to AVCodecInternal
Conflicts:
libavcodec/internal.h
libavcodec/rawdec.c
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab71be091206a2264f3a8862215fc284bb8e6274
---
More information about the ffmpeg-cvslog
mailing list