diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-10 12:56:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-10 12:57:08 +0100 |
| commit | ac6e074fb711468a2ff3f241a1641dc5b34b386d (patch) | |
| tree | 3bf8ed5dfef4709e9a0112628f54dc5673892fe0 /libavformat/idcin.c | |
| parent | 56ca871fb3d6c60a97ac678a919d8253fcb3ebdd (diff) | |
| parent | ed79093222ceb42f0c3a39095a69af0b32be5450 (diff) | |
Merge commit 'ed79093222ceb42f0c3a39095a69af0b32be5450'
* commit 'ed79093222ceb42f0c3a39095a69af0b32be5450':
rtpdec: Add a terminating null byte at the end of the SDES/CNAME
yuv4mpeg: do not use deprecated functions
oggdec: fix faulty cleanup prototype
idcin: return 0 from idcin_read_packet() on success.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/idcin.c')
| -rw-r--r-- | libavformat/idcin.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/idcin.c b/libavformat/idcin.c index fcbf1c15a6..6bda74c19a 100644 --- a/libavformat/idcin.c +++ b/libavformat/idcin.c @@ -345,7 +345,7 @@ static int idcin_read_packet(AVFormatContext *s, if (idcin->audio_present) idcin->next_chunk_is_video ^= 1; - return ret; + return 0; } static int idcin_read_seek(AVFormatContext *s, int stream_index, |