Michael Niedermayer 1b58f13761 Merge commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1' ...

* commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1':
  lavc: export DV profile API used by muxer/demuxer as public

Conflicts:
	configure
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/dv_profile.c
	libavcodec/dv_profile.h
	libavcodec/version.h
	libavformat/dvenc.c

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

2014-07-09 22:27:07 +02:00

16 KiB

Raw Blame History

View Raw