diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-18 13:30:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-18 13:30:20 +0100 |
| commit | 7ae5cadb0ace6e76640133fa9e6eeca294e2d7bf (patch) | |
| tree | 11aeacda29273fb7835a7a1fc009bf61654c3c0e /libswresample/resample_template.c | |
| parent | ceb0d79f46463dc10fb413e7e5ca799967b06475 (diff) | |
| parent | ca80e15814b77efe8d0ff5a5b0220754bb6c4065 (diff) | |
| download | ffmpeg-streaming-7ae5cadb0ace6e76640133fa9e6eeca294e2d7bf.zip ffmpeg-streaming-7ae5cadb0ace6e76640133fa9e6eeca294e2d7bf.tar.gz | |
Merge commit 'ca80e15814b77efe8d0ff5a5b0220754bb6c4065'
* commit 'ca80e15814b77efe8d0ff5a5b0220754bb6c4065':
mpegts: Forward error codes in various functions
Conflicts:
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/resample_template.c')
0 files changed, 0 insertions, 0 deletions
