generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '3ee26080d6b3e777992b4b4124e62e1bf0ac0a65' into release/0.10

Browse Source 
* commit '3ee26080d6b3e777992b4b4124e62e1bf0ac0a65':
  h264: reset data_partitioning if decoding the slice header for NAL_DPA fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-06-03 01:27:23 +02:00
parent 1ab94468dd 3ee26080d6
commit f2275400fe
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/h264.c
View File

@@ -4047,8 +4047,13 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size){
hx->intra_gb_ptr= hx->intra_gb_ptr=
hx->inter_gb_ptr= NULL; 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 */
s->data_partitioning = 0;
break; break;
}
hx->s.data_partitioning = 1; hx->s.data_partitioning = 1;