diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 22:21:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 22:27:07 +0200 |
| commit | 1b58f1376132026a7633fea253f0ed67a8392343 (patch) | |
| tree | a9c9f17d083967a9e231643e8fee155f9f678a6c /libavdevice/jack_audio.c | |
| parent | 9098f0ecd7bfa8e971ab92bd0c244cb003ef43b2 (diff) | |
| parent | f6ee61fb05482c617f5deee29a190d8ff483b3d1 (diff) | |
| download | ffmpeg-1b58f1376132026a7633fea253f0ed67a8392343.tar.gz | |
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>
Diffstat (limited to 'libavdevice/jack_audio.c')
0 files changed, 0 insertions, 0 deletions