diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-26 03:35:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-26 04:10:47 +0100 |
| commit | 484e59a0a0329c4005ddacd05051925345f4362f (patch) | |
| tree | e5521f4eb5095df300545bb30694d1e3427115c9 /libavfilter/avcodec.h | |
| parent | c48f67f06ec3b887626b5938987d2a46bd52cf77 (diff) | |
| parent | 80dc7c0160fb27e46fc0caae8af10b3d63730c7c (diff) | |
| download | ffmpeg-484e59a0a0329c4005ddacd05051925345f4362f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avs: call release_buffer() at the end.
Add minor bumps and APIchanges entries for lavc/lavfi changes.
mpegvideo.c: K&R formatting and cosmetics.
avconv: avoid memcpy in vsrc_buffer when possible.
avconv: implement get_buffer()/release_buffer().
lavfi: add a new function av_buffersrc_buffer().
lavfi: add avfilter_copy_frame_props()
lavc: add format field to AVFrame
lavc: add width and height fields to AVFrame
lavc: add a sample_aspect_ratio field to AVFrame
doxy: add website-alike style to the html output
FAQ: add an entry for common error when using -profile
Conflicts:
avconv.c
cmdutils.c
doc/APIchanges
libavcodec/avcodec.h
libavcodec/mpegvideo.c
libavcodec/utils.c
libavcodec/version.h
libavfilter/Makefile
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/src_movie.c
libavfilter/vsrc_buffer.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avcodec.h')
| -rw-r--r-- | libavfilter/avcodec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/avcodec.h b/libavfilter/avcodec.h index dec5ae4a7c..22dd1a263e 100644 --- a/libavfilter/avcodec.h +++ b/libavfilter/avcodec.h @@ -36,7 +36,7 @@ * Copy the frame properties of src to dst, without copying the actual * image data. */ -void avfilter_copy_frame_props(AVFilterBufferRef *dst, const AVFrame *src); +int avfilter_copy_frame_props(AVFilterBufferRef *dst, const AVFrame *src); /** * Create and return a picref reference from the data and properties |