Michael Niedermayer
|
f8ae3a2108
|
Merge remote branch 'qatar/master'
12 files changed, 36 insertions(+), 81 deletions(-)
yes thats 36 new lines in 14 commits
* qatar/master:
ffmpeg: fix -aspect cli option
Restructure video filter implementation in ffmpeg.c.
ffplay: remove audio_write_get_buf_size() forward declaration
lavfi: print key-frame and picture type information in ff_dlog_ref()
mathops: remove ancient confusing comment
cws2fws: Improve error message wording.
tools: Check the return value of write().
mpegaudio: move OUT_FMT macro to mpegaudiodec.c
mpegaudio: remove OUT_MIN/MAX macros
Add missing #includes to mp3_header_(de)compress bsf
dct: fix indentation
dct: bypass table allocation for DCT_II of size 32
h264dsp_mmx: Add #ifdefs around some mmxext functions on x86_64.
Remove unused header mpegaudio3.h.
Conflicts:
ffmpeg.c
libavcodec/mpegaudio.h
libavcodec/mpegaudio3.h
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2011-05-17 04:51:33 +02:00 |
Diego Biurrun
|
d39facc783
|
tools: Check the return value of write().
This fixes several warnings of the type:
warning: ignoring return value of ‘write’, declared with attribute warn_unused_result
|
2011-05-16 20:56:56 +02:00 |
Mans Rullgard
|
2912e87a6c
|
Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
|
2011-03-19 13:33:20 +00:00 |
Jean-Daniel Dupas
|
cc947f04cc
|
Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
Patch by Jean-Daniel Dupas, devlists shadowlab org
Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
2010-03-31 12:29:58 +00:00 |
Zdenek Kabelac
|
92147b6bec
|
Use new packet reading API, fixes a memory leak.
patch by Zdenek Kabelac, zdenek.kabelac gmail com
Originally committed as revision 18728 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
2009-05-01 21:39:53 +00:00 |
|
Diego Biurrun
|
3ef6182556
|
Fix #include path, headers from other directories need to have
the directory name prefixed now.
Originally committed as revision 14868 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
2008-08-20 21:58:05 +00:00 |
|
Diego Biurrun
|
6878026ada
|
Add '#undef strcat' to fix compilation.
Originally committed as revision 11529 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
2008-01-14 22:22:19 +00:00 |
|
Måns Rullgård
|
c07ed8c8a2
|
create and populate "tools" directory
Originally committed as revision 9634 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
2007-07-13 21:33:24 +00:00 |