RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
44,979 Commits 36 Branches 398 Tags 244 MiB
Commit Graph

44979 Commits

Author SHA1 Message Date
Michael Niedermayer f5b31daa5e libopusenc: use more specific and correct name for the channel order 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-02 17:34:10 +02:00
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>
 2012-10-02 17:27:52 +02:00
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>
 2012-10-02 14:58:19 +02:00
Michael Niedermayer f7f5370b4b mov: add option to ignore edit lists. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-02 14:18:46 +02:00
Stefano Sabatini e97e0eff84 doc/swresample.txt: fix typos 2012-10-02 09:43:27 +02:00
Stefano Sabatini c053f48662 lavfi/transpose: add passthrough option 2012-10-02 09:43:06 +02:00
Stefano Sabatini 6300062774 lavfi/transpose: add support to named options and shortands 
Allow extensibility.
 2012-10-02 09:20:10 +02:00
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>
 2012-10-02 02:24:55 +02:00
Michael Niedermayer 44ae7badae ffmpeg: print muxed packet sizes in debug output too 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-02 02:14:02 +02:00
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>
 2012-10-02 01:09:12 +02:00
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>
 2012-10-02 01:09:12 +02:00
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>
 2012-10-02 01:09:12 +02:00
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.
 2012-10-02 00:26:15 +02:00
Clément Bœsch 2308c5bb25 lavfi/edgedetect: add missing minus in a comment. 2012-10-01 22:31:14 +02:00
Clément Bœsch d771b1d137 lavfi: EBU R.128 scanner. 2012-10-01 22:26:19 +02:00
Clément Bœsch 81bbce9cf3 Move xGA font data from lavc to lavu. 
This needs to be accessible for libavfilter in the next commit.
 2012-10-01 22:24:17 +02:00
Justin Ruggles bfcd4b6a16 adpcmdec: set AVCodec.sample_fmts 2012-10-01 13:42:44 -04:00
Justin Ruggles 1478a3601e twinvq: use planar sample format 2012-10-01 13:42:44 -04:00
Justin Ruggles a34be78546 ralf: use planar sample format 2012-10-01 13:42:44 -04:00
Justin Ruggles 1a3459033d mpc7/8: use planar sample format 2012-10-01 13:42:44 -04:00
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.
 2012-10-01 13:42:43 -04:00
Justin Ruggles 3fca0d7210 iac/imc: use planar sample format 2012-10-01 13:42:43 -04:00
Justin Ruggles 64c312aa29 dcadec: use float planar sample format 2012-10-01 13:42:43 -04:00
Justin Ruggles cbf6ee7823 cook: use planar sample format 2012-10-01 13:42:43 -04:00
Justin Ruggles 9af4eaa8ea atrac3: use float planar sample format 2012-10-01 13:42:43 -04:00
Justin Ruggles 461ba7e97a apedec: output in planar sample format 2012-10-01 13:42:43 -04:00
Justin Ruggles cf8c93ada4 8svx: use planar sample format 2012-10-01 13:42:43 -04:00
Michael Niedermayer c39916bc2f jpeglsdec: move pict debug log under correct if() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-01 16:45:59 +02:00
Michael Niedermayer 64604e2679 cpu: improve av_get_cpu_flags() doxy 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-01 16:41:37 +02:00
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>
 2012-10-01 16:12:38 +02:00
Nathan Caldwell 6cb8c85409 Opus encoder using libopus 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-10-01 14:42:40 +02:00
Diego Biurrun 15d35bee83 mpegts: Drop pointless casting of hex_dump_debug arguments 2012-10-01 13:18:28 +02:00
Diego Biurrun d3c40a7d1d avformat: const correctness for av_hex_dump / av_hex_dump_log 2012-10-01 13:18:28 +02:00
Diego Biurrun d25fe4cc65 wmadec: Adjust debug printf argument length modifier 2012-10-01 12:46:41 +02:00
Diego Biurrun 1218777ffd avcodec: Convert some commented-out printf/av_log instances to av_dlog 2012-10-01 10:24:28 +02:00
Diego Biurrun 9c6cf7f2c9 avcodec: Drop silly and/or broken printf debug output 2012-10-01 10:24:28 +02:00
Diego Biurrun 6f6b0311a3 avcodec: Drop some silly commented-out av_log() invocations 2012-10-01 10:24:28 +02:00
Diego Biurrun 72eaba5e4f avformat: Convert some commented-out printf/av_log instances to av_dlog 2012-10-01 10:24:28 +02:00
Diego Biurrun 11d4e92ed9 avformat: Remove non-compiling and/or silly commented-out printf/av_log statements 2012-10-01 10:24:28 +02:00
Diego Biurrun 14d3e7ad11 Remove some silly disabled code. 2012-10-01 10:24:28 +02:00
Paul B Mahol adc5539e7b smacker: read escape codes in single get_bits() call 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-01 07:51:47 +00:00
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
 2012-10-01 00:10:59 -04:00
Michael Niedermayer 14fd34d73b movenc: fix edit list for the case of negative pts. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-01 04:53:40 +02:00
Michael Niedermayer 015b805d13 sws: drop unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-30 23:14:20 +02:00
Michael Niedermayer 115e291b53 swscale: move main swscale wraper to swscale.c 
It never belonged to swscale_unscaled.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-30 23:10:56 +02:00
Michael Niedermayer 59003fe7c0 qt-faststart: simplify code by using FFMIN 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-30 22:19:54 +02:00
Michael Niedermayer 610efb6773 qt-faststart: dont allocate a bigger buffer than needed 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-30 22:19:54 +02:00
Jan Ehrhardt f4d9148fe2 qt-faststart: speedup 
qt-faststart is terribly slow when the input file and the output file
are on a slow disk like a SD card. By increasing the copy_buffer from
1K to 32M I decreased the processing time on a sample file from
1600 seconds to 4 seconds. The timing difference is during 'copying
rest of file'.

S:\SD_VIDEO\PRG001>e:\utils\qt-faststart 00005.mp4 5.mp4
ftyp          0 32
free         32 8
mdat         40 13744391
moov   13744431 141848
 patching stco atom...
 patching stco atom...
 writing ftyp atom...
 writing moov atom...
 copying rest of file...

Execution time: 1576.259 s

S:\SD_VIDEO\PRG001>s:\utils\qt-faststart 00005.mp4 5.mp4
ftyp          0 32
free         32 8
mdat         40 13744391
moov   13744431 141848
 patching stco atom...
 patching stco atom...
 writing ftyp atom...
 writing moov atom...
 copying rest of file...

Execution time: 3.846 s

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-30 22:19:54 +02:00
Clément Bœsch 13d878366f lavfi/ashowinfo: check plane value before deferencing. 2012-09-30 21:00:52 +02:00
Giorgio Vazzana a8cb21fd62 xtea: fix decryption with --enable-small 
iv decrypt handling code needs to be executed regardless of CONFIG_SMALL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-30 20:52:13 +02:00