69035f3ec7
Revert "libutvideodec: Make buf_size local"
...
This change was dependent on a different patch that
never actually made it into FFmpeg, and it actually
ended up breaking builds.
This reverts commit 70cf7bb958
2011-12-01 23:35:54 +01:00
dd7453a24e
Fix id3v2 extended header handling.
...
When skipping over the extended header, take into account
that the size field has already been read. The extended header
also takes up space, so adjust total header length accordingly.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 23:27:41 +01:00
18abf46b6f
configure: add forgotten libx264rgb_encoder_deps
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 22:29:58 +01:00
8c15f9d79c
Merge remote-tracking branch 'cus/stable'
...
* cus/stable:
ffplay: Copy audio side data too. This fixes handling of some rare nellymoser files that change the sample rate mid stream (sample file at: http://trac.videolan.org/vlc/ticket/5586 )
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 21:35:20 +01:00
dd974c1bc1
libx264: Implement rgb24 support through a seperate AVCodec.
...
This avoids people mistakely encoding in a way that many players dont support.
Fixes Ticket658
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 21:02:57 +01:00
59a58884b9
ffplay: Copy audio side data too. This fixes handling of some rare nellymoser files that change the sample rate mid stream (sample file at: http://trac.videolan.org/vlc/ticket/5586 )
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
2011-12-01 20:55:01 +01:00
4a8e3324fb
libx264: fix generic boolean support
...
Fixes Ticket660
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 20:38:14 +01:00
b50be4e38d
vc1_parser: fix NULL pointer dereference
...
Fixes Ticket456
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 18:46:22 +01:00
d9cc6bb432
Support ffmpeg -dn to disable copying data streams.
...
Fixes ticket #647 .
2011-12-01 18:02:04 +01:00
3e1951e8f4
h264: More restrictive more_rbsp_data_in_pps()
...
Fixes Ticket697
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 17:28:46 +01:00
f3f488423a
pictordec: prevent segfault when reading corrupted files
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 14:35:46 +01:00
43a2a8b4a3
pictordec: use correct context for another av_log
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 14:34:46 +01:00
67eb95ce15
ffmpeg: fix segfault with ffmpeg -h
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 04:32:27 +01:00
03b60509cb
ffmpeg: fix changing sample rate handling
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 04:06:59 +01:00
ec20fc1581
lavf: allow grouping packets in chunks of a user specified size and duration.
...
This is similar to MP4Boxs -inter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 03:53:13 +01:00
31f9032b78
lavf: add audio_preload option, this allows interleaving audio earlier
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 03:53:07 +01:00
54e40b9c14
ffmpeg: factorize duration calculation in transcode_video()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 03:49:38 +01:00
6e96ad8215
ffmpeg: make copy_tb tri state so the user can select either timebase or
...
leave it at auto
Inspired-by a change from Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 03:49:37 +01:00
9d76cf0b18
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
rtpdec: Templatize the code for different g726 bitrate variants
rv40: move loop filter to rv34dsp context
lavf: make av_set_pts_info private.
rtpdec: Add support for G726 audio
rtpdec: Add an init function that can do custom codec context initialization
avconv: make copy_tb on by default.
matroskadec: don't set codec timebase.
rmdec: don't set codec timebase.
avconv: compute next_pts from input packet duration when possible.
lavf: estimate frame duration from r_frame_rate.
avconv: update InputStream.pts in the streamcopy case.
Conflicts:
avconv.c
libavdevice/alsa-audio-dec.c
libavdevice/bktr.c
libavdevice/fbdev.c
libavdevice/libdc1394.c
libavdevice/oss_audio.c
libavdevice/v4l.c
libavdevice/v4l2.c
libavdevice/vfwcap.c
libavdevice/x11grab.c
libavformat/au.c
libavformat/eacdata.c
libavformat/flvdec.c
libavformat/mpegts.c
libavformat/mxfenc.c
libavformat/rtpdec_g726.c
libavformat/wtv.c
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 02:54:24 +01:00
0275b75a7e
BPP fix, YUVP9, 10, 16 support, make RGB24 default
2011-11-30 16:48:03 -07:00
9dcd8b86f9
Use correct context for av_log.
...
Fixes ticket #695 .
2011-12-01 00:28:46 +01:00
c863d3751f
movenc: replace cluster memset by zeroing only the needed field.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 23:11:49 +01:00
c8f0e88b20
rtpdec: Templatize the code for different g726 bitrate variants
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-30 23:20:07 +02:00
bb8a6e03cc
rv40: move loop filter to rv34dsp context
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-11-30 20:54:59 +00:00
77af2672b4
lavc: Fix side data handling for audio decoders.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 21:19:23 +01:00
11828b8885
nellymoserdec: Use sidedata to support mid stream sample rate changes.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 21:17:57 +01:00
957a593cd9
flvdemux: export flags for nellymoser through side data.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 21:16:33 +01:00
c3f9ebf743
lavf: make av_set_pts_info private.
...
It's supposed to be called only from (de)muxers.
2011-11-30 20:34:45 +01:00
8f025f2f60
avfilter: align allocated images to 32 for AVX and IFF
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 18:53:47 +01:00
fd3e75d2d4
lavc: horizontal align for IFF
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 18:45:33 +01:00
8d5078c10b
ac3probe: Change threshold from 500 to 200 to keep in sync with mp3.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 18:08:23 +01:00
b51eaf3b8c
mp3probe: Detect mp3 stronger with just 200 frames, this should speed up detection
...
on mp3 streams.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 18:07:20 +01:00
06d7325ab1
rtpdec: Add support for G726 audio
...
This requires using a separate init function, since there
isn't necessarily any fmtp lines for this codec, so
parse_sdp_a_line won't be called. Incorporating it with the
alloc function wouldn't do either, since it is called before
the full rtpmap line is parsed (where the sample rate is
extracted).
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-30 17:39:32 +02:00
2583660664
rtpdec: Add an init function that can do custom codec context initialization
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2011-11-30 17:32:18 +02:00
dd32a305bd
wmall: fix return type of dump_int_buffer()
...
Found-by: Dominique Leuenberger
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 15:23:39 +01:00
4710993800
movenc: memset(0) new cluster elements after realloc()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 15:23:34 +01:00
dae7ff0416
wmall: remove tabs that leaked in from a merge and seem to have
...
managed to silently bypass the push checks.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 15:21:46 +01:00
7bb3e62594
avconv: make copy_tb on by default.
...
I.e. on streamcopy set output codec timebase from input stream timebase
(as opposed to input codec timebase). This should be more sane, because
since the stream is not decoded, the input codec tb has no relation to
the timestamps of the copied packets.
2011-11-30 07:47:43 +01:00
c98c1f434e
matroskadec: don't set codec timebase.
...
It's not supposed to be set outside of lavc.
2011-11-30 07:47:43 +01:00
d3e3ffa501
rmdec: don't set codec timebase.
...
It's not supposed to be set outside of lavc.
Set r_frame_rate instead.
2011-11-30 07:47:43 +01:00
741a05a293
avconv: compute next_pts from input packet duration when possible.
2011-11-30 07:47:43 +01:00
2092232581
lavf: estimate frame duration from r_frame_rate.
...
If r_frame_rate is set, it should be more reliable for this than either
codec or stream timebase.
2011-11-30 07:47:43 +01:00
91b412e786
avconv: update InputStream.pts in the streamcopy case.
...
This was broken in 2a651b719c
2011-11-30 07:47:43 +01:00
b55dd10d62
Fix typeo in some rarely used memoization
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 05:28:08 +01:00
d31c68a7ed
removes spurious warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 05:28:07 +01:00
c40a35f8a7
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
indeo3: check per-plane data buffer against input buffer bounds.
avconv: Handle audio sync for non-S16 sample formats.
pthread: don't increment index on zero-sized packets.
Conflicts:
libavcodec/indeo3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 02:34:35 +01:00
23b4f355bb
ffmpeg.c use b:v for video bitrates using a target
...
it's more consistent to use -b:v instead of just -b
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30 00:22:31 +01:00
b6ffe441cd
ffmpeg: do not use a negative total_size (AVERROR) in bitrate estimation.
2011-11-29 23:07:13 +01:00
7076967786
Consistently use %ifdef ARCH_X86_64
...
One out of 3 places used ifndef, which is needlessly confusing.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-11-29 19:55:38 +01:00
464ccb0144
indeo3: check per-plane data buffer against input buffer bounds.
...
Fixes : http://bugzilla.libav.org/show_bug.cgi?id=102
Signed-off-by: Alex Converse <alex.converse@gmail.com>
2011-11-29 09:58:05 -08:00
Derek Buitenhuis
Adrian Drzewiecki
Michael Niedermayer
Carl Eugen Hoyos
Peter Ross
Michael Bradshaw
Martin Storsjö
Janne Grunau
Anton Khirnov
Miroslav Slugeň
Joseph Wecker
Jean First
Clément Bœsch
Reimar Döffinger
Aneesh Dogra