Michael Niedermayer 88679aeb08 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 <michaelni@gmx.at>

2015-06-10 20:41:36 +02:00

15 KiB

Raw Blame History

View Raw