diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 15:47:30 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-08 15:47:34 +0200 |
commit | 06f7e87e15a6dd15a9fe0e1f0bfa9f72c8886475 (patch) | |
tree | fca6c8fb313f159d1ee757e80e772bf5a6010ca1 /libavformat/utils.c | |
parent | 420f63984b39dbc847295126ee2e701df068dd53 (diff) | |
parent | 80c268eaaee402695a74d14acf76063100692a99 (diff) | |
download | ffmpeg-06f7e87e15a6dd15a9fe0e1f0bfa9f72c8886475.tar.gz |
Merge commit '80c268eaaee402695a74d14acf76063100692a99' into release/1.1
* commit '80c268eaaee402695a74d14acf76063100692a99':
cdgraphics: do not return 0 from the decode function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions