summaryrefslogtreecommitdiffstats
path: root/libavfilter/src_movie.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-01-27 18:02:42 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-27 18:03:43 +0100
commit62a82c66cd3f03e045867471c5edcc84b4d2b54e (patch)
treeed8a8d99a235f959088b28fe131c6c4e5fcbe610 /libavfilter/src_movie.c
parentb44456c908965231160f9b8f88de8c0dc447aa1f (diff)
parent728685f37ab333ca35980bd01766c78d197f784a (diff)
downloadffmpeg-streaming-62a82c66cd3f03e045867471c5edcc84b4d2b54e.zip
ffmpeg-streaming-62a82c66cd3f03e045867471c5edcc84b4d2b54e.tar.gz
Merge commit '728685f37ab333ca35980bd01766c78d197f784a'
* commit '728685f37ab333ca35980bd01766c78d197f784a': Add a side data type for audio service type. Conflicts: doc/APIchanges libavcodec/avcodec.h libavcodec/version.h libavutil/frame.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/src_movie.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud