diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 20:34:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 20:34:28 +0200 |
| commit | d123d9abef52931f54701e5fb0ed569416258f75 (patch) | |
| tree | 75d6632334cb59ba0b057f03dc170877edc6872f /libavformat | |
| parent | c24be3c4a2e15e7295bdef8183deb168b6835eb9 (diff) | |
| parent | 8dca0877e3e1457e9ec79ffa1ead1135aabb791c (diff) | |
| download | ffmpeg-d123d9abef52931f54701e5fb0ed569416258f75.tar.gz | |
Merge commit '8dca0877e3e1457e9ec79ffa1ead1135aabb791c'
* commit '8dca0877e3e1457e9ec79ffa1ead1135aabb791c':
mpegts: Return proper error code on invalid input data
Conflicts:
libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mpegtsenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 6ae2391480..1a54c1ad02 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1177,7 +1177,7 @@ int ff_check_h264_startcode(AVFormatContext *s, const AVStream *st, const AVPack if (!st->nb_frames) { av_log(s, AV_LOG_ERROR, "H.264 bitstream malformed, " "no startcode found, use the h264_mp4toannexb bitstream filter (-bsf h264_mp4toannexb)\n"); - return AVERROR(EINVAL); + return AVERROR_INVALIDDATA; } av_log(s, AV_LOG_WARNING, "H.264 bitstream error, startcode missing\n"); } |