diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-04 13:11:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-04 13:11:45 +0200 |
| commit | 0f1446a4d010a1210c8b13562e83c9b157553764 (patch) | |
| tree | d774ba3ebddf721dfac6357d8d958ce757a63fa3 /libavformat/h264dec.c | |
| parent | 741f5b021a0494676de0dab543f8a9591ec2e01e (diff) | |
| parent | ab35ec29a4071871934856c00da7d6ebcc0c095b (diff) | |
| download | ffmpeg-0f1446a4d010a1210c8b13562e83c9b157553764.tar.gz | |
Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b'
* commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b':
vf_overlay: get rid of pointless messing with timebase.
samplefmt: make av_samples_alloc() initialize the data to silence.
libspeexdec: handle NULL return value from speex_packet_to_header()
h264probe: Don't error out on bits that no longer are reserved
mpegvideo: set extended_data in ff_update_duplicate_context()
libspeexdec: properly handle DTX for multiple frames-per-packet
libspeexdec: move the SpeexHeader from LibSpeexContext to where it is used
libspeexdec: simplify setting of frame_size
libspeexdec: set channel_layout
Conflicts:
libavfilter/vf_overlay.c
libavformat/h264dec.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/h264dec.c')
| -rw-r--r-- | libavformat/h264dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/h264dec.c b/libavformat/h264dec.c index 7e525e0bc9..9c67ab9545 100644 --- a/libavformat/h264dec.c +++ b/libavformat/h264dec.c @@ -54,7 +54,7 @@ static int h264_probe(AVProbeData *p) case 1: sli++; break; case 5: idr++; break; case 7: - if(p->buf[i+2]&0x03) + if (p->buf[i + 2] & 0x03) return 0; sps++; break; |