Michael Niedermayer
dd78e1090b
Merge commit '1e46c63eb72be752e044ba32257d77f35cbd9dac'
...
* commit '1e46c63eb72be752e044ba32257d77f35cbd9dac':
avformat: refactor avformat_write_header
Conflicts:
libavformat/mux.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
6cbbf4a274
Merge commit '86bbdf865e04bc5ddc2021b0620e6de634375253'
...
* commit '86bbdf865e04bc5ddc2021b0620e6de634375253':
avformat: refactor avformat_write_header
Conflicts:
libavformat/mux.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
513042c926
Merge commit '55f9037f38bc3beacb2f5a17408c1d24c077d7fd'
...
* commit '55f9037f38bc3beacb2f5a17408c1d24c077d7fd':
avformat: split muxing functions from util.c
Conflicts:
libavformat/internal.h
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
f5b31daa5e
libopusenc: use more specific and correct name for the channel order
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
e88ca80dc3
Merge commit 'bfcd4b6a1691d20aebc6d2308424c2a88334a9f0'
...
* commit 'bfcd4b6a1691d20aebc6d2308424c2a88334a9f0':
adpcmdec: set AVCodec.sample_fmts
twinvq: use planar sample format
ralf: use planar sample format
mpc7/8: use planar sample format
iac/imc: use planar sample format
dcadec: use float planar sample format
cook: use planar sample format
atrac3: use float planar sample format
apedec: output in planar sample format
8svx: use planar sample format
Conflicts:
libavcodec/8svx.c
libavcodec/dcadec.c
libavcodec/mpc7.c
libavcodec/mpc8.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
82db8ee321
Merge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'
...
* commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d':
avconv: improve sample format negotiation for decoder request
Opus encoder using libopus
mpegts: Drop pointless casting of hex_dump_debug arguments
avformat: const correctness for av_hex_dump / av_hex_dump_log
wmadec: Adjust debug printf argument length modifier
Conflicts:
Changelog
ffmpeg.c
libavcodec/libopusdec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
f7f5370b4b
mov: add option to ignore edit lists.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Stefano Sabatini
e97e0eff84
doc/swresample.txt: fix typos
12 years ago
Stefano Sabatini
c053f48662
lavfi/transpose: add passthrough option
12 years ago
Stefano Sabatini
6300062774
lavfi/transpose: add support to named options and shortands
...
Allow extensibility.
12 years ago
Dmitry Samonenko
c785b6db73
Libspeex VAD support
...
Option for Voice Activity Detection is added to speex encoder.
Speex detects non-speech periods and encodes them with just enough bits
to reproduce the background noise, aka ``comfort noise generation''.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
44ae7badae
ffmpeg: print muxed packet sizes in debug output too
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
4abc411b97
nutenc: choose for non audio streams a timebase with finer resolution.
...
While a 25 fps stream can in general store frame durations in 1/25
units, this is not true for the timestamps. For example a 25fps
and a 25000/1001 fps stream when they are stored together might have
a matching 0 timestamp point but when for example a chapter from
this is cut the new start is no longer aligned. The issue gets
MUCH worse when the streams are lower fps, like 1 or 2 fps.
This commit thus makes the muxer choose a multiple of the
framerate as timebase that is at least about 20 micro seconds precise
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
e3fb5bc147
nut: store and read the r_frame_rate
...
With this, when we use a finer timebase than neccessary to store
durations the demuxer still knows what the original timebase was.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
4eb0f5f635
nutenc: use 1/sample rate as timebase for audio instead of framesize/sample rate
...
This way audio frames can be exactly stored even when they are not
aligned with timestamp 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Clément Bœsch
c4dba58f47
isom: fix redundant redeclaration of ff_mov_read_chan().
...
Silence a GCC warning. A leftover of the disabled version is still
available in lavf/isom.c.
12 years ago
Clément Bœsch
2308c5bb25
lavfi/edgedetect: add missing minus in a comment.
12 years ago
Clément Bœsch
d771b1d137
lavfi: EBU R.128 scanner.
12 years ago
Clément Bœsch
81bbce9cf3
Move xGA font data from lavc to lavu.
...
This needs to be accessible for libavfilter in the next commit.
12 years ago
Luca Barbato
1e46c63eb7
avformat: refactor avformat_write_header
...
Split away option settings, sanity checks and general setup.
12 years ago
Luca Barbato
86bbdf865e
avformat: refactor avformat_write_header
...
Mostly cosmetic changes adding some intermediate to shorten the lines.
12 years ago
Luca Barbato
55f9037f38
avformat: split muxing functions from util.c
12 years ago
Justin Ruggles
bfcd4b6a16
adpcmdec: set AVCodec.sample_fmts
12 years ago
Justin Ruggles
1478a3601e
twinvq: use planar sample format
12 years ago
Justin Ruggles
a34be78546
ralf: use planar sample format
12 years ago
Justin Ruggles
1a3459033d
mpc7/8: use planar sample format
12 years ago
Justin Ruggles
fd41cb4370
avconv: improve sample format negotiation for decoder request
...
This takes into account planar vs. packed when comparing to find the closest
sample format match.
12 years ago
Justin Ruggles
3fca0d7210
iac/imc: use planar sample format
12 years ago
Justin Ruggles
64c312aa29
dcadec: use float planar sample format
12 years ago
Justin Ruggles
cbf6ee7823
cook: use planar sample format
12 years ago
Justin Ruggles
9af4eaa8ea
atrac3: use float planar sample format
12 years ago
Justin Ruggles
461ba7e97a
apedec: output in planar sample format
12 years ago
Justin Ruggles
cf8c93ada4
8svx: use planar sample format
12 years ago
Michael Niedermayer
c39916bc2f
jpeglsdec: move pict debug log under correct if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
64604e2679
cpu: improve av_get_cpu_flags() doxy
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
31ab1575e5
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avcodec: Convert some commented-out printf/av_log instances to av_dlog
avcodec: Drop silly and/or broken printf debug output
avcodec: Drop some silly commented-out av_log() invocations
avformat: Convert some commented-out printf/av_log instances to av_dlog
avformat: Remove non-compiling and/or silly commented-out printf/av_log statements
Remove some silly disabled code.
ac3dec: ensure get_buffer() gets a buffer for the correct number of channels
Conflicts:
libavcodec/dnxhddec.c
libavcodec/ffv1.c
libavcodec/h264.c
libavcodec/h264_parser.c
libavcodec/mjpegdec.c
libavcodec/motion_est_template.c
libavcodec/mpegaudiodec.c
libavcodec/mpegvideo_enc.c
libavcodec/put_bits.h
libavcodec/ratecontrol.c
libavcodec/wmaenc.c
libavdevice/timefilter.c
libavformat/asfdec.c
libavformat/avidec.c
libavformat/avienc.c
libavformat/flvenc.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Nathan Caldwell
6cb8c85409
Opus encoder using libopus
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
12 years ago
Diego Biurrun
15d35bee83
mpegts: Drop pointless casting of hex_dump_debug arguments
12 years ago
Diego Biurrun
d3c40a7d1d
avformat: const correctness for av_hex_dump / av_hex_dump_log
12 years ago
Diego Biurrun
d25fe4cc65
wmadec: Adjust debug printf argument length modifier
12 years ago
Diego Biurrun
1218777ffd
avcodec: Convert some commented-out printf/av_log instances to av_dlog
12 years ago
Diego Biurrun
9c6cf7f2c9
avcodec: Drop silly and/or broken printf debug output
12 years ago
Diego Biurrun
6f6b0311a3
avcodec: Drop some silly commented-out av_log() invocations
12 years ago
Diego Biurrun
72eaba5e4f
avformat: Convert some commented-out printf/av_log instances to av_dlog
12 years ago
Diego Biurrun
11d4e92ed9
avformat: Remove non-compiling and/or silly commented-out printf/av_log statements
12 years ago
Diego Biurrun
14d3e7ad11
Remove some silly disabled code.
12 years ago
Paul B Mahol
adc5539e7b
smacker: read escape codes in single get_bits() call
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Justin Ruggles
56b6a43056
ac3dec: ensure get_buffer() gets a buffer for the correct number of channels
...
If there is an error during frame parsing, but AVCodecContext.channels was
changed and AC3DecodeContext.out_channels was set previously, the two may not
match.
Fixes CVE-2012-2802
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
12 years ago
Michael Niedermayer
14fd34d73b
movenc: fix edit list for the case of negative pts.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
015b805d13
sws: drop unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago