diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 14:45:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 15:00:53 +0200 |
| commit | 58bdec57fa92cca36df470bf16bc8d124d142479 (patch) | |
| tree | eb6a7b30f796c4631266e9db42f95c451c9322e6 | |
| parent | 7434225ed15d7326cf9d906a7cd3539eb8184e8e (diff) | |
| parent | 1147d39bca135df8673031d16989ba486a52172a (diff) | |
| download | ffmpeg-58bdec57fa92cca36df470bf16bc8d124d142479.tar.gz | |
Merge commit '1147d39bca135df8673031d16989ba486a52172a' into release/1.1
* commit '1147d39bca135df8673031d16989ba486a52172a':
h264: reset data_partitioning if decoding the slice header for NAL_DPA fails
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 7268c3b5cb..7d8697847d 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4199,8 +4199,13 @@ again: hx->intra_gb_ptr = hx->inter_gb_ptr = NULL; - if ((err = decode_slice_header(hx, h)) < 0) + if ((err = decode_slice_header(hx, h)) < 0) { + /* make sure data_partitioning is cleared if it was set + * before, so we don't try decoding a slice without a valid + * slice header later */ + h->s.data_partitioning = 0; break; + } hx->s.data_partitioning = 1; break; |