diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-12 01:25:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-12 01:25:37 +0100 |
| commit | 7fad19a63dc52db4bf2bebbd9d261675956b1b34 (patch) | |
| tree | 8997428f45d54f3177dc6cd208d0375daa6fe201 /libavformat/movenc.h | |
| parent | 16abd687798bbf9192ba4954765e61de96065b8b (diff) | |
| parent | 599b4c6efddaed33b1667c386b34b07729ba732b (diff) | |
| download | ffmpeg-7fad19a63dc52db4bf2bebbd9d261675956b1b34.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: cabac: replace explicit memory references with "m" operands
avplay: don't request a stereo downmix
wmapro: use av_float2int()
lavc: avoid invalid memcpy() in avcodec_default_release_buffer()
lavu: replace int/float punning functions
lavfi: install libavfilter/vsrc_buffer.h
Remove extraneous semicolons
sdp: Restore the original mp4 format h264 extradata if converted
rtpenc: Add support for mp4 format h264
rtpenc: Simplify code by introducing a separate end pointer
movenc: Use the actual converted sample for RTP hinting
Fix a bunch of common typos.
Conflicts:
doc/developer.texi
doc/eval.texi
doc/filters.texi
doc/protocols.texi
ffmpeg.c
ffplay.c
libavcodec/mpegvideo.h
libavcodec/x86/cabac.h
libavfilter/Makefile
libavformat/avformat.h
libavformat/cafdec.c
libavformat/flvdec.c
libavformat/flvenc.c
libavformat/gxfenc.c
libavformat/img2.c
libavformat/movenc.c
libavformat/mpegts.c
libavformat/rtpenc_h264.c
libavformat/utils.c
libavformat/wtv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.h')
| -rw-r--r-- | libavformat/movenc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/movenc.h b/libavformat/movenc.h index e0ed6e6516..356421c7db 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -131,7 +131,8 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt); int ff_mov_init_hinting(AVFormatContext *s, int index, int src_index); int ff_mov_add_hinted_packet(AVFormatContext *s, AVPacket *pkt, - int track_index, int sample); + int track_index, int sample, + uint8_t *sample_data, int sample_size); void ff_mov_close_hinting(MOVTrack *track); #endif /* AVFORMAT_MOVENC_H */ |