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.h | |
| parent | 96df29c318ff64cb6ac706c11cbf932d96962fd7 (diff) | |
| parent | b691fd7a4dfca766075c022922a75cdbca4e6d92 (diff) | |
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.h')
| -rw-r--r-- | libavcodec/h264.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 7739754948..153d83c695 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -678,7 +678,6 @@ void ff_h264_hl_decode_mb(H264Context *h); int ff_h264_frame_start(H264Context *h); int ff_h264_decode_extradata(H264Context *h, const uint8_t *buf, int size); av_cold int ff_h264_decode_init(AVCodecContext *avctx); -av_cold int ff_h264_decode_end(AVCodecContext *avctx); av_cold void ff_h264_decode_init_vlc(void); /** |