diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-14 04:55:27 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-14 04:56:26 +0200 |
commit | 173cd695cbb79a50a0738ce7bcc966cb40f4a28a (patch) | |
tree | 1a8025d98e71b5950eb12ed24c2c8787a5c185e3 /libavcodec/h264.c | |
parent | fdb5e02901111a6a53f8386d82afae0aa2d746a7 (diff) | |
parent | 35bdaf3d427b6856df01d41ee826bd515440ec46 (diff) | |
download | ffmpeg-streaming-173cd695cbb79a50a0738ce7bcc966cb40f4a28a.zip ffmpeg-streaming-173cd695cbb79a50a0738ce7bcc966cb40f4a28a.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (24 commits)
utils: Drop pointless '#if 1' preprocessor directive.
ac3enc: remove empty ac3_float function that is never called
ac3enc: split templated float vs. fixed functions into a separate file.
ac3enc: dynamically allocate AC3EncodeContext fields windowed_samples and mdct
ac3enc: use function pointer to choose between AC-3 and E-AC-3 header output functions.
Roll back 4:4:4 H.264 for now Needs some ARM/PPC asm modifications.
Fix SVQ3 after adding 4:4:4 H.264 support
H.264: fix CODEC_FLAG_GRAY
4:4:4 H.264 decoding support
h264_parser: Fix whitespace after previous change.
h264_parser: Fix behaviour when PARSER_FLAG_COMPLETE_FRAMES is set.
wav: remove an invalid free().
lavf: initialise reference_dts in av_estimate_timings_from_pts.
h264: don't be so picky on decoding pps in extradata.
avcodec.h: add or elaborate on some documentation comments.
h264: change a few comments into error messages
ac3dec: fix doxy-style for comment ("///>" should be "///<" instead).
img2: add .dpx to the list of supported file extensions.
ffv1: fix undefined behavior with insane widths.
ARM: jrevdct_arm: simplify stack usage
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r-- | libavcodec/h264.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 4da2807..5c81214 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -995,7 +995,7 @@ int ff_h264_decode_extradata(H264Context *h) cnt = *(p++); // Number of pps for (i = 0; i < cnt; i++) { nalsize = AV_RB16(p) + 2; - if(decode_nal_units(h, p, nalsize) < 0) { + if (decode_nal_units(h, p, nalsize) < 0) { av_log(avctx, AV_LOG_ERROR, "Decoding pps %d from avcC failed\n", i); return -1; } @@ -2351,8 +2351,8 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ MPV_common_end(s); } if (!s->context_initialized) { - if(h != h0){ - av_log(h->s.avctx, AV_LOG_ERROR, "we cant (re-)initialize context during parallel decoding\n"); + if (h != h0) { + av_log(h->s.avctx, AV_LOG_ERROR, "Cannot (re-)initialize context during parallel decoding.\n"); return -1; } @@ -2398,8 +2398,8 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ s->avctx->hwaccel = ff_find_hwaccel(s->avctx->codec->id, s->avctx->pix_fmt); - if (MPV_common_init(s) < 0){ - av_log(h->s.avctx, AV_LOG_ERROR, "MPV_common_init() failed\n"); + if (MPV_common_init(s) < 0) { + av_log(h->s.avctx, AV_LOG_ERROR, "MPV_common_init() failed.\n"); return -1; } s->first_field = 0; @@ -2409,8 +2409,8 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ ff_h264_alloc_tables(h); if (!HAVE_THREADS || !(s->avctx->active_thread_type&FF_THREAD_SLICE)) { - if (context_init(h) < 0){ - av_log(h->s.avctx, AV_LOG_ERROR, "context_init() failed\n"); + if (context_init(h) < 0) { + av_log(h->s.avctx, AV_LOG_ERROR, "context_init() failed.\n"); return -1; } } else { @@ -2428,8 +2428,8 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ } for(i = 0; i < s->avctx->thread_count; i++) - if(context_init(h->thread_context[i]) < 0){ - av_log(h->s.avctx, AV_LOG_ERROR, "context_init() failed\n"); + if (context_init(h->thread_context[i]) < 0) { + av_log(h->s.avctx, AV_LOG_ERROR, "context_init() failed.\n"); return -1; } } @@ -2737,8 +2737,8 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ av_log(s->avctx, AV_LOG_INFO, "Cannot parallelize deblocking type 1, decoding such frames in sequential order\n"); h0->single_decode_warning = 1; } - if(h != h0){ - av_log(h->s.avctx, AV_LOG_ERROR, "deblocking switched inside frame\n"); + if (h != h0) { + av_log(h->s.avctx, AV_LOG_ERROR, "Deblocking switched inside frame.\n"); return 1; } } |