ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Wed Jun 10
20:40:18 2015 +0200| [88679aeb08b9b29613d283eb5ad29abbabd5a9e9] | committer:
Michael Niedermayer
Merge commit '7061bf0925a7d6c5899bbe710b2b8cdae9005274'
* commit '7061bf0925a7d6c5899bbe710b2b8cdae9005274':
mpegvideo: Move Picture-related functions to a separate file
Conflicts:
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=88679aeb08b9b29613d283eb5ad29abbabd5a9e9
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
