Michael Niedermayer
c065255bba
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
aacenc: Fix LONG_START windowing.
aacenc: Fix a bug where deinterleaved samples were stored in the wrong place.
avplay: use the correct array size for stride.
lavc: extend doxy for avcodec_alloc_context3().
APIchanges: mention avcodec_alloc_context()/2/3
avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS.
aacsbr: ARM NEON optimised sbrdsp functions
aacsbr: align some arrays
aacsbr: move some simdable loops to function pointers
cosmetics: Remove extra newlines at EOF
Conflicts:
libavcodec/utils.c
libavfilter/formats.c
libavutil/mem.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-29 00:34:59 +01:00
Alex Converse
7181c4edee
cosmetics: Remove extra newlines at EOF
2012-01-27 17:19:09 -08:00
Michael Niedermayer
7ae251b4d8
h264_mp4toannexb_filter: pass error code through.
...
Bug-Found-by and Suggested bugfix: Tanami, Ohad
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-29 21:01:41 +01:00
Michael Niedermayer
9d4cb45dbe
Cleanup 'Fix spurious warning when stream has SPS and PPS units.'
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-08 12:29:30 +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
Philip Langdale
025225d7ee
h264_mp4toannexb_bsf: Fix spurious warning when stream has SPS and PPS units.
...
Signed-off-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-15 07:20:44 -04:00
Ronald S. Bultje
4e84f994d3
reindent.
2011-03-07 13:18:57 -05:00
Sean McGovern
02dd3666c2
h264_mp3toannexb_bsg: don't crash, but warn, if PPS/SPS not found.
...
Should an AVC-1 in MP4 stream not contain SPS or PPS NAL units,
this BSF is then unable to allocate an output buffer for the
modified stream. Warn that the resulting stream may be unplayable.
Fix roundup issue #2386 .
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-07 10:19:46 -05:00
Diego Elio Pettenò
d36beb3f69
Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.
...
None of these symbols should be accessed directly, so declare them as
hidden.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-26 16:08:45 +00:00
Benoit Fouet
bb5cfc48f1
Cosmetics: alignment and long line break.
...
Originally committed as revision 23559 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-10 06:00:37 +00:00
Benoit Fouet
1f7d2f54c5
Cosmetics: use and place braces correctly in if ... else statements.
...
Originally committed as revision 23558 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-10 06:00:06 +00:00
Benoit Fouet
639c697c4f
Sanitize av_realloc() use in h264 mp4toannexb bistream filter.
...
Originally committed as revision 23557 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-10 05:59:22 +00:00
Luca Abeni
d5cc1ed723
Improve the mp4toannexb BSF to convert the extradata.
...
Originally committed as revision 23545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-09 06:47:01 +00:00
Thomas Devanneaux
52486603b5
Check NAL unit size to avoid reading past the buffer.
...
This fixes issue1907
Patch by Thomas Devanneaux gmail(thomdev)
Originally committed as revision 23078 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-10 07:08:57 +00:00
Alex Converse
ec21c21563
Add a quick description to the H.264 BSF
...
Originally committed as revision 18809 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 06:06:59 +00:00
Diego Biurrun
6a5d31ac25
Fix build: Add intreadwrite.h and bswap.h #includes where necessary.
...
Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 22:19:48 +00:00
Benoit Fouet
074bfa7de7
Change email address to a valid one.
...
Originally committed as revision 15848 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 14:04:56 +00:00
Andreas Öman
48aecf5a7d
Fix a bug causing the generated stream to be corrupt if the buffer
...
contains NAL units previous to the IDR where the SPS/PPS was inserted.
Ok:ed by Benoit on irc.
Originally committed as revision 11482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-09 08:38:28 +00:00
Benoit Fouet
bdfae2a575
Add a bitstream filter for H.264.
...
Originally committed as revision 10422 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-06 12:36:07 +00:00