diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-30 22:10:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-30 22:10:17 +0200 |
| commit | 2b6325cacb6def8e9de0455f575b51a8bd90b12c (patch) | |
| tree | 9975f34681673f4ce96537ea6684ff0fa8f5df89 /libavcodec/h264.c | |
| parent | 96df29c318ff64cb6ac706c11cbf932d96962fd7 (diff) | |
| parent | b691fd7a4dfca766075c022922a75cdbca4e6d92 (diff) | |
| download | ffmpeg-2b6325cacb6def8e9de0455f575b51a8bd90b12c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: drop ff_h264_ prefix from static function ff_h264_decode_rbsp_trailing()
h264: Make ff_h264_decode_end() static, it is not used externally.
output-example: K&R formatting cosmetics, comment spelling fixes
avf: make the example output the proper message
avf: fix audio writing in the output-example
mov: don't overwrite existing indexes.
lzw: fix potential integer overflow.
truemotion: forbid invalid VLC bitsizes and token values.
truemotion2: handle out-of-frame motion vectors through edge extension.
configure: Check for a different SDL function
Conflicts:
configure
doc/examples/muxing.c
libavcodec/truemotion2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index b504dcf1cb..c6dc24391c 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -271,7 +271,7 @@ nsc: * Identify the exact end of the bitstream * @return the length of the trailing, or 0 if damaged */ -static int ff_h264_decode_rbsp_trailing(H264Context *h, const uint8_t *src) +static int decode_rbsp_trailing(H264Context *h, const uint8_t *src) { int v = *src; int r; @@ -4260,7 +4260,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size) dst_length--; bit_length = !dst_length ? 0 : (8 * dst_length - - ff_h264_decode_rbsp_trailing(h, ptr + dst_length - 1)); + decode_rbsp_trailing(h, ptr + dst_length - 1)); if (s->avctx->debug & FF_DEBUG_STARTCODE) av_log(h->s.avctx, AV_LOG_DEBUG, "NAL %d/%d at %d/%d length %d pass %d\n", hx->nal_unit_type, hx->nal_ref_idc, buf_index, buf_size, dst_length, pass); @@ -4606,7 +4606,7 @@ av_cold void ff_h264_free_context(H264Context *h) av_freep(h->pps_buffers + i); } -av_cold int ff_h264_decode_end(AVCodecContext *avctx) +static av_cold int h264_decode_end(AVCodecContext *avctx) { H264Context *h = avctx->priv_data; MpegEncContext *s = &h->s; @@ -4664,7 +4664,7 @@ AVCodec ff_h264_decoder = { .id = CODEC_ID_H264, .priv_data_size = sizeof(H264Context), .init = ff_h264_decode_init, - .close = ff_h264_decode_end, + .close = h264_decode_end, .decode = decode_frame, .capabilities = /*CODEC_CAP_DRAW_HORIZ_BAND |*/ CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_SLICE_THREADS | @@ -4684,7 +4684,7 @@ AVCodec ff_h264_vdpau_decoder = { .id = CODEC_ID_H264, .priv_data_size = sizeof(H264Context), .init = ff_h264_decode_init, - .close = ff_h264_decode_end, + .close = h264_decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY | CODEC_CAP_HWACCEL_VDPAU, .flush = flush_dpb, |