diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-18 16:02:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-18 16:02:50 +0100 |
| commit | cbefb3d9098bd8c7bcac890e4e99de602f09c5bc (patch) | |
| tree | 13bf895d393b8a96f3622a42dab1ed846bbdad33 /libavcodec/xsubdec.c | |
| parent | 74906d3727ec3bd9b7b28dfa7a98ff6e8cf8b6d7 (diff) | |
| parent | cc20fbcd39c7b60602edae4f7deb092ecfd3c975 (diff) | |
| download | ffmpeg-cbefb3d9098bd8c7bcac890e4e99de602f09c5bc.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmphttp: Check for both 0 and AVERROR_EOF
Conflicts:
libavformat/rtmphttp.c
See: d04b7de786780747878c080ba522405c6f542ccb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xsubdec.c')
0 files changed, 0 insertions, 0 deletions