diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-30 10:35:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-30 10:35:29 +0100 |
| commit | 0b9e480b8f3be266acf708bbab80d53bb7f48b7d (patch) | |
| tree | f705c39bd3e004e67bf15dbf9a9a09ee105df87f /libavformat/smoothstreamingenc.c | |
| parent | 70737b83f06e34a8b4f9eb70948b2f2ca6711992 (diff) | |
| parent | 5e5fb21877d8da7b3b8a27bb4d6a070d210c152d (diff) | |
| download | ffmpeg-0b9e480b8f3be266acf708bbab80d53bb7f48b7d.tar.gz | |
Merge commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d'
* commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d':
oggparsetheora: return meaningful error codes
Conflicts:
libavformat/oggparsetheora.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/smoothstreamingenc.c')
0 files changed, 0 insertions, 0 deletions