aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/cafenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-30 10:13:23 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-10-30 10:23:24 +0100
commit558784f113f1436a48f34db2612c3b6460e6c734 (patch)
tree2b0ed3468b3a15e232f71697a46bb758161b6f85 /libavformat/cafenc.c
parent4427fe7e4bf652856e4ee4101fae3c361fc8637f (diff)
parentb9589f5a770ec2357ab7920a5fabe8510b8601f9 (diff)
downloadffmpeg-558784f113f1436a48f34db2612c3b6460e6c734.tar.gz
Merge commit 'b9589f5a770ec2357ab7920a5fabe8510b8601f9'
* commit 'b9589f5a770ec2357ab7920a5fabe8510b8601f9': lavc: add error checking to apply_param_change. Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/cafenc.c')
0 files changed, 0 insertions, 0 deletions