Michael Niedermayer e77b9853ea Merge commit 'a2941c8cb216bdc144953cace64973f5600ffa2d' ...

* commit 'a2941c8cb216bdc144953cace64973f5600ffa2d':
  lavc: move CODEC_FLAG_MV0 to mpegvideo

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-05-01 17:03:59 +02:00

74 KiB

Raw Blame History

View Raw