aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/aacps.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-08-20 15:48:21 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-08-20 15:48:21 +0200
commit927022a75372b9e127c490c8cd87f027c3957dc3 (patch)
tree89cdb06c6861be36dfeccb833a7b14d1f0f6ad85 /libavcodec/aacps.h
parenta5a0dedf111d6fd4fc41c3e82287f434c8f6c4d3 (diff)
parentd3810c47fe8c9509c28c65c0244e743c1d353daf (diff)
downloadffmpeg-927022a75372b9e127c490c8cd87f027c3957dc3.tar.gz
Merge commit 'd3810c47fe8c9509c28c65c0244e743c1d353daf'
* commit 'd3810c47fe8c9509c28c65c0244e743c1d353daf': avconv: get rid of ugly casts in the options table. avconv: try to match codecs by codec descriptor name as a last resort. avtools: fix show_foo() signatures. Conflicts: cmdutils.c cmdutils.h cmdutils_common_opts.h ffmpeg_opt.c ffplay.c ffprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacps.h')
0 files changed, 0 insertions, 0 deletions