aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/voc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-07-05 20:40:32 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-07-05 20:40:41 +0200
commit92c7ef1e30d677f29c06caf765c527c9db486861 (patch)
treeba774fd50803cf2aad9b6d29ab575fbf763cabf8 /libavformat/voc.c
parentacb52d322818694da1c1e03c82bd887cddac8f3e (diff)
parentd99001cab3573361e9fe8033348dde3a807828f1 (diff)
downloadffmpeg-92c7ef1e30d677f29c06caf765c527c9db486861.tar.gz
Merge branch 'mxfenc_improvements' of https://github.com/mbouron/FFmpeg
* 'mxfenc_improvements' of https://github.com/mbouron/FFmpeg: mxfenc: support dnxhd codec mxfenc: support smpte dv codec Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/voc.c')
0 files changed, 0 insertions, 0 deletions