[FFmpeg-cvslog] Merge commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  9 22:21:46 2014 +0200| [1b58f1376132026a7633fea253f0ed67a8392343] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1b58f1376132026a7633fea253f0ed67a8392343
---