aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/dnxhdenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-16 09:46:19 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-16 09:46:19 +0200
commit39354d608933fe37a5ec86de4c691bcb46df0dac (patch)
treed503a0a3bf2da5e070d456c1b683bfaf5b92aed8 /libavcodec/dnxhdenc.c
parent0d83b5722e2875cd4a2ac3574af72b5be633c73d (diff)
parentff4fc5ef12a37716c5c5d8928a2db92428e916ec (diff)
downloadffmpeg-39354d608933fe37a5ec86de4c691bcb46df0dac.tar.gz
Merge commit 'ff4fc5ef12a37716c5c5d8928a2db92428e916ec'
* commit 'ff4fc5ef12a37716c5c5d8928a2db92428e916ec': jpegls: K&R formatting cosmetics Conflicts: libavcodec/jpegls.c libavcodec/jpegls.h libavcodec/jpeglsdec.c libavcodec/jpeglsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dnxhdenc.c')
0 files changed, 0 insertions, 0 deletions