Michael Niedermayer a71fcfad89 Merge commit '9325d88eba8038b3e2a4485e473a018410379e2d' ...

* commit '9325d88eba8038b3e2a4485e473a018410379e2d':
  lavc: remove obsolete and disabled avpriv functions

Conflicts:
	libavcodec/dv_profile.c
	libavcodec/dv_profile.h

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

2014-08-10 02:09:13 +02:00

2.6 KiB

Raw Blame History

View Raw