aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/flvenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-12 12:36:04 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-12 12:36:04 +0200
commit54bbb9056801b778126a4bf5036d9d3638da1802 (patch)
tree6cffb68457486351ced1dc2f59f0db246aa8a5dc /libavcodec/flvenc.c
parentc6953589f9c48a7420ea4284f404fb656ddf869f (diff)
parent170fb593c617cd797d00cf05bfb8d8c21d612893 (diff)
downloadffmpeg-54bbb9056801b778126a4bf5036d9d3638da1802.tar.gz
Merge commit '170fb593c617cd797d00cf05bfb8d8c21d612893'
* commit '170fb593c617cd797d00cf05bfb8d8c21d612893': pcx: K&R formatting cosmetics Conflicts: libavcodec/pcx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flvenc.c')
0 files changed, 0 insertions, 0 deletions