aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/arm/flacdsp_init_arm.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-08 23:43:40 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-08 23:58:18 +0100
commitfa14685a578d4d37f9a53c2399bba7770e48f747 (patch)
tree7b748d69f420ba6b2fd8a62433b194addf60d1ad /libavcodec/arm/flacdsp_init_arm.c
parentd5e9fc782150d4596c72440a0aa02b7f4f1254b1 (diff)
parent7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f (diff)
downloadffmpeg-fa14685a578d4d37f9a53c2399bba7770e48f747.tar.gz
Merge commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f'
* commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f': avprobe: Export coded_{width,height} in -show_streams Conflicts: avprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/flacdsp_init_arm.c')
0 files changed, 0 insertions, 0 deletions