diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 21:08:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-30 21:09:42 +0100 |
| commit | a3b9f53d7b2faa0d60fa2308351c5aef3381630f (patch) | |
| tree | 18d424501c153aae0fa07ae1e4ccc67874d1f163 /libavformat/webvttenc.c | |
| parent | d43d627a24dba944c3c6bf08146ad4945c2bc9b3 (diff) | |
| parent | 7dc827b7091b1ca85508b536fa776b49f363b0f4 (diff) | |
| download | ffmpeg-a3b9f53d7b2faa0d60fa2308351c5aef3381630f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dcadec: Add some logging before returning on error
Conflicts:
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/webvttenc.c')
0 files changed, 0 insertions, 0 deletions