aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-19 14:28:58 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-19 14:28:58 +0100
commitaf804dbe9ed0e6a1b2d5e9eca1a7155c2fe91e3e (patch)
treef093e566a4985317a2dc7d9f3f5df38599142720 /ffmpeg.c
parent80a9297b711b7acb152ebbf84b28772945f920ea (diff)
parent523c7bd23c781aa0f3a85044896f5e18e8b52534 (diff)
downloadffmpeg-af804dbe9ed0e6a1b2d5e9eca1a7155c2fe91e3e.tar.gz
Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'
* commit '523c7bd23c781aa0f3a85044896f5e18e8b52534': misc typo, style and wording fixes Conflicts: libavcodec/options_table.h libavutil/pixfmt.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions