Merge commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 20:21:46 +0000 (22:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Jul 2014 20:27:07 +0000 (22:27 +0200)
commit1b58f1376132026a7633fea253f0ed67a8392343
treea9c9f17d083967a9e231643e8fee155f9f678a6c
parent9098f0ecd7bfa8e971ab92bd0c244cb003ef43b2
parentf6ee61fb05482c617f5deee29a190d8ff483b3d1
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>
13 files changed:
configure
doc/APIchanges
libavcodec/Makefile
libavcodec/dv.c
libavcodec/dv.h
libavcodec/dv_profile.c
libavcodec/dv_profile.h
libavcodec/dv_profile_internal.h
libavcodec/dvdec.c
libavcodec/dvenc.c
libavcodec/version.h
libavformat/dv.c
libavformat/dvenc.c