Paul B Mahol
dea9da5f16
qcelpdata: correct start bit for cbgain[0] in qcelp_rate_octave_bitmap[]
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-19 01:24:56 +00:00
Michael Niedermayer
c4a32d92fe
ffmpeg: Fix shortest with libx264
...
Encoders that buffer a significant number of frames where a "few"
frames off with -shortest
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-19 00:08:37 +01:00
Stefano Sabatini
1b9ced685a
MAINTAINERS: update my GPG key fingerprint
2012-12-18 23:08:02 +01:00
Carl Eugen Hoyos
d687b8c875
Cosmetics: Reindent after last commit.
2012-12-18 23:06:00 +01:00
Carl Eugen Hoyos
00a62e6776
Do not skip three bytes and don't search for extradata in old realaudio files.
...
Fixes ticket #1557 .
2012-12-18 23:04:19 +01:00
Michael Niedermayer
9700a7a1dd
af_apad: remove unneeded av_opt_free
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 17:31:01 +01:00
Michael Niedermayer
c311431e29
apad: add whole_len and pad_len options.
...
These options allow padding to a specific length or adding a specific amount if silence.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 17:30:31 +01:00
Michael Niedermayer
c2640146e0
apad: fix apad_options formating
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 17:16:03 +01:00
Michael Niedermayer
b7e085a288
af_apad: add user setable packet_size
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 17:01:33 +01:00
Michael Niedermayer
5eae7f8f35
avfilter: add apad filter
...
This filter pads an audio stream with silence
It can together with -shortest be used to extend audio streams to
the same length as video.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 16:30:08 +01:00
Michael Niedermayer
5c2fc3bdd7
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
configure: formatting cosmetics
h264: use mbaff ref indices in fill_colmap() only for mbaff references
Conflicts:
libavcodec/h264_direct.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 15:00:05 +01:00
Michael Niedermayer
14f79ba18f
h264: remove redundant parts of old slice in extradata code.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 14:52:44 +01:00
Michael Niedermayer
99321d1b03
h264: merge old and new "slice in extradata" checks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 14:50:12 +01:00
Michael Niedermayer
09b4ae8331
Merge commit '61c6eef5456f2bc8b1dc49a0a759c975551cea29'
...
* commit '61c6eef5456f2bc8b1dc49a0a759c975551cea29':
h264: prevent decoding of slice NALs in extradata
doxy: Clarify what avpriv_set_pts_info does
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 14:38:10 +01:00
Michael Niedermayer
94ecbe23c5
Merge commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a'
...
* commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a':
au: Reorder code so that both muxer and demuxer are under #ifdefs
fate: Move RALF test into lossless audio group
cosmetics: Use consistent names for multiple inclusion guards.
Conflicts:
libavformat/au.c
tests/fate/lossless-audio.mak
tests/fate/real.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 14:27:59 +01:00
Peter Ross
95015634f5
wtv: permit root table and first sectors to be located beyond 2GB boundary
...
Fixes ticket #2025 .
Signed-off-by: Peter Ross <pross@xvid.org>
2012-12-19 00:18:17 +11:00
Michael Niedermayer
ebfb738fa4
nutdec: sanity check r_frame_rate
...
This fixes files that store a somewhat incorrect value.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 14:03:04 +01:00
Diego Biurrun
ea061af15a
configure: formatting cosmetics
2012-12-18 13:36:50 +01:00
Michael Niedermayer
c9aab8a123
h264: use mbaff ref indices in fill_colmap() only for mbaff references
...
Prevents writing beyond array bounds.
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
2012-12-18 11:02:23 +01:00
Janne Grunau
61c6eef545
h264: prevent decoding of slice NALs in extradata
...
It is not posible to call get_buffer during frame-mt codec
initialization. Libavformat might pass huge amounts of data as
extradata after parsing broken files. The 'extradata' for the fuzzed
sample sample_varPAR_s5374_r001-02.avi is 2.8M large and contains
multiple slices.
2012-12-18 11:01:14 +01:00
Clément Bœsch
8b63744f48
Fix "bistream" typo and add a check in tools/patcheck.
2012-12-18 02:47:34 +01:00
Stefano Sabatini
1dd33d472a
doc/ffmpeg-bitstream-filters: fix typo in title
2012-12-18 02:00:28 +01:00
Carl Eugen Hoyos
a71de9a2a2
Fix typo in mvc decoder.
2012-12-18 01:58:17 +01:00
Michael Niedermayer
41bebda485
mjpegenc: fix restart interval parameters for yuv444
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 01:21:48 +01:00
Michael Niedermayer
28b85b1fff
mjpegenc: fix YUV444 with w%16!=0
...
Fixes Ticket2040
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-18 01:21:48 +01:00
Stefano Sabatini
85e6f6d9c1
doc/indevs: update syntax for the color filter in the lavfi device examples
2012-12-18 00:06:35 +01:00
Stefano Sabatini
1f9855dbc1
doc/texi2pod: correctly handle @url commands in the form @url{URL,...}
...
Ignore the other arguments, which have not to be processed by the POD
renderer.
2012-12-18 00:06:35 +01:00
Stefano Sabatini
9bba683578
doc/Makefile: add docclean rule
...
This allows to clean the doc directory from the parent project dir.
The command:
make -C doc clean
does not work as long as the paths specified in doc/Makefile are relative
to the parent dir.
Also it is consitent with "testclean" and "distclean" targets.
2012-12-18 00:06:17 +01:00
Stefano Sabatini
f14e248783
doc/texi2pod: add support to @ifhtml and @ifnothtml directives
...
With these commands it is possible to add HTML and non-HTML snippets,
which will be useful for the "See Also" manual chapters.
2012-12-17 23:54:07 +01:00
Stefano Sabatini
992772b947
doc: remove references to external documents
...
Fix a few warnings generated when creating the manuals.
Our current doc generation toolchain does not allow to reference external
documents.
2012-12-17 23:53:50 +01:00
Michael Niedermayer
1d29624c73
oggparsevorbis: check channels
...
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-17 20:51:50 +01:00
Jernej Virag
2f7465b5bf
SAP muxer set session name from metadata
...
Pass "title" metadata field to av_sdp_create (as in RTP muxer) in SAP
muxer for correct
session name in SAP SDP announcements.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-17 17:31:55 +01:00
Michael Niedermayer
8976ef7aec
concatdec: change data type to suppress warning about limited range of data type on some platforms.
...
Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-17 17:31:34 +01:00
Derek Buitenhuis
26e4f0c70f
doxy: Clarify what avpriv_set_pts_info does
...
The "pts for a given stream" was nonsensical.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2012-12-17 11:20:00 -05:00
Derek Buitenhuis
df0d6735b3
doxy: Clarify what avpriv_set_pts_info does
...
The "pts for a given stream" was nonsensical.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2012-12-17 11:18:27 -05:00
Diego Biurrun
c35f0e8495
au: Reorder code so that both muxer and demuxer are under #ifdefs
...
This reduces code size when either piece has been disabled.
2012-12-17 17:02:22 +01:00
Diego Biurrun
4d6c96fd69
fate: Move RALF test into lossless audio group
2012-12-17 17:02:22 +01:00
Diego Biurrun
81c7c817a4
cosmetics: Use consistent names for multiple inclusion guards.
2012-12-17 17:02:22 +01:00
Michael Niedermayer
8505daacc5
Merge remote-tracking branch 'ramiro/dshow'
...
* ramiro/dshow:
dshow: call CoUninitialize() on dshow_read_close()
dshow: handle events in graph
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-17 14:38:26 +01:00
Michael Niedermayer
082dd17bd2
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avresample: use valid log context in mixing functions
lavr: remove automatic context close/open for resampling compensation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-17 14:11:51 +01:00
Michael Niedermayer
8d07bbca63
Merge commit 'f322b2073581119de5da74f92a03309a36891cfa'
...
* commit 'f322b2073581119de5da74f92a03309a36891cfa':
lavr: only save/restore the mixing matrix if mixing is being done
rtpdec_vp8: Cosmetics: Fix bad alignment/indentation
rtpenc: Allow including a SDES/CNAME block in RTCP SR packets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-17 14:06:11 +01:00
Michael Niedermayer
021b3497e1
Merge commit '65e053271a98f7acf3ef6b412998cfcb44a8eef8'
...
* commit '65e053271a98f7acf3ef6b412998cfcb44a8eef8':
rtpenc_vp8: Include the picture number in VP8 packets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-17 13:46:54 +01:00
Piotr Bandurski
0f450ac575
siff: set duration
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-17 13:34:30 +01:00
Peter Ross
fb9d58509c
isom: support SGI RLE 8-bit in QuickTime file format
...
Signed-off-by: Peter Ross <pross@xvid.org>
2012-12-17 20:37:54 +11:00
Peter Ross
6fb40779cd
Silicon Graphics Movie (.mv) demuxer
...
Signed-off-by: Peter Ross <pross@xvid.org>
2012-12-17 20:37:54 +11:00
Peter Ross
746b1dcc98
Silicon Graphics Motion Video Compressor 1 & 2 decoder
...
Signed-off-by: Peter Ross <pross@xvid.org>
2012-12-17 20:37:54 +11:00
Peter Ross
afa1617b93
SGI RLE 8-bit decoder
...
Signed-off-by: Peter Ross <pross@xvid.org>
2012-12-17 20:37:54 +11:00
Ramiro Polla
83a9f29f60
dshow: call CoUninitialize() on dshow_read_close()
...
Every call to CoInitialize should have a matching CoUnititalize.
Based on patch by Don Moir <donmoir@comcast.net>.
2012-12-17 03:44:51 -02:00
Ramiro Polla
190f6135b4
dshow: handle events in graph
...
Handling DirectShow events prevents infinite loops when there is an error in
the graph, such as a device being disconnected. This makes it possible for
dshow to return an error to the caller and run the cleanup code.
Based on patch by Don Moir <donmoir@comcast.net>.
2012-12-17 03:44:12 -02:00
Hendrik Leppkes
0cf3505930
avresample: use valid log context in mixing functions
...
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
2012-12-16 19:59:58 -05:00