diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-30 13:13:23 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-30 13:23:24 +0400 |
commit | 558784f113f1436a48f34db2612c3b6460e6c734 (patch) | |
tree | 2b0ed3468b3a15e232f71697a46bb758161b6f85 /libavformat/oggparsetheora.c | |
parent | 4427fe7e4bf652856e4ee4101fae3c361fc8637f (diff) | |
parent | b9589f5a770ec2357ab7920a5fabe8510b8601f9 (diff) |
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/oggparsetheora.c')
0 files changed, 0 insertions, 0 deletions