aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-05 01:18:48 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-05 01:18:48 +0100
commitdcbc748ad11b7a683c54b4afc350f734adcded4e (patch)
tree9386abe2d1139c16a1f54c691ffaebc18a46475a /libavdevice
parent20be510887d0985c370957371025d5d7f721bb79 (diff)
parentd509ae5be0a9bac35a4cedbe68b774a74446bb27 (diff)
downloadffmpeg-dcbc748ad11b7a683c54b4afc350f734adcded4e.tar.gz
Merge commit 'd509ae5be0a9bac35a4cedbe68b774a74446bb27'
* commit 'd509ae5be0a9bac35a4cedbe68b774a74446bb27': jvdec: K&R formatting cosmetics Conflicts: libavcodec/jvdec.c libavformat/jvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
0 files changed, 0 insertions, 0 deletions