[FFmpeg-cvslog] Merge commit 'ab05ed4c322ed0488ac9b5d2ef5d4ffa55a946a7'
Michael Niedermayer
git at videolan.org
Sun Jul 12 21:42:00 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Jul 12 21:34:59 2015 +0200| [ddd86e4747f2e33bf6b6e0926e158c8998e05eb3] | committer: Michael Niedermayer
Merge commit 'ab05ed4c322ed0488ac9b5d2ef5d4ffa55a946a7'
* commit 'ab05ed4c322ed0488ac9b5d2ef5d4ffa55a946a7':
mpegvideo_parser: export pixel format and dimensions
Conflicts:
libavcodec/mpegvideo_parser.c
Merged-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ddd86e4747f2e33bf6b6e0926e158c8998e05eb3
---
More information about the ffmpeg-cvslog
mailing list