ffmpeg.git
7 years ago8svx: copy start value in output samples.
Nicolas George [Tue, 31 Jul 2012 16:34:45 +0000 (18:34 +0200)]
8svx: copy start value in output samples.

Otherwise, the last byte of each stream is left uninitialized.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffserver: fix potential buffer overflow, based on wrong fscanf format indentifier.
Martin Ettl [Tue, 2 Oct 2012 20:57:25 +0000 (22:57 +0200)]
ffserver: fix potential buffer overflow, based on wrong fscanf format indentifier.

Fixed Ticket1780

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years ago8svx: remove malloc and memcpy that have become unneeded
Michael Niedermayer [Tue, 2 Oct 2012 20:44:09 +0000 (22:44 +0200)]
8svx: remove malloc and memcpy that have become unneeded

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofix exit_program() prototypes
Michael Niedermayer [Tue, 2 Oct 2012 19:55:17 +0000 (21:55 +0200)]
fix exit_program() prototypes

This fixes 2 warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 2 Oct 2012 17:43:01 +0000 (19:43 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ARM: fix Thumb PIC on Apple
  nut: add do {} while (0) to GET_V
  tiffenc: Check av_malloc() results.
  tiffenc: Simplify pixel format setup using AVPixFmtDescriptor.
  Use atexit() instead of defining a custom exit_program() interface.
  msvc: Fix detection of VFW & Avisynth required libs

Conflicts:
ffmpeg.c
ffmpeg_opt.c
ffplay.c
ffprobe.c
ffserver.c
libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '1e46c63eb72be752e044ba32257d77f35cbd9dac'
Michael Niedermayer [Tue, 2 Oct 2012 16:48:56 +0000 (18:48 +0200)]
Merge commit '1e46c63eb72be752e044ba32257d77f35cbd9dac'

* commit '1e46c63eb72be752e044ba32257d77f35cbd9dac':
  avformat: refactor avformat_write_header

Conflicts:
libavformat/mux.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '86bbdf865e04bc5ddc2021b0620e6de634375253'
Michael Niedermayer [Tue, 2 Oct 2012 16:31:47 +0000 (18:31 +0200)]
Merge commit '86bbdf865e04bc5ddc2021b0620e6de634375253'

* commit '86bbdf865e04bc5ddc2021b0620e6de634375253':
  avformat: refactor avformat_write_header

Conflicts:
libavformat/mux.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '55f9037f38bc3beacb2f5a17408c1d24c077d7fd'
Michael Niedermayer [Tue, 2 Oct 2012 16:15:13 +0000 (18:15 +0200)]
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>
7 years agolibopusenc: use more specific and correct name for the channel order
Michael Niedermayer [Tue, 2 Oct 2012 15:34:10 +0000 (17:34 +0200)]
libopusenc: use more specific and correct name for the channel order

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'bfcd4b6a1691d20aebc6d2308424c2a88334a9f0'
Michael Niedermayer [Tue, 2 Oct 2012 14:25:58 +0000 (16:25 +0200)]
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>
7 years agoMerge commit 'fd41cb43702498948ff14ba8c284fd5c15fc729d'
Michael Niedermayer [Tue, 2 Oct 2012 12:38:01 +0000 (14:38 +0200)]
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>
7 years agomov: add option to ignore edit lists.
Michael Niedermayer [Tue, 2 Oct 2012 03:28:27 +0000 (05:28 +0200)]
mov: add option to ignore edit lists.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoARM: fix Thumb PIC on Apple
Mans Rullgard [Mon, 1 Oct 2012 23:32:24 +0000 (00:32 +0100)]
ARM: fix Thumb PIC on Apple

LDR with register offset and PC as base register is not available in
the Thumb instruction set so the addition must be done separately.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agonut: add do {} while (0) to GET_V
Luca Barbato [Tue, 2 Oct 2012 02:13:23 +0000 (04:13 +0200)]
nut: add do {} while (0) to GET_V

Make it consistent with the other function-like macros.

7 years agodoc/swresample.txt: fix typos
Stefano Sabatini [Mon, 1 Oct 2012 20:44:53 +0000 (22:44 +0200)]
doc/swresample.txt: fix typos

7 years agolavfi/transpose: add passthrough option
Stefano Sabatini [Sun, 30 Sep 2012 11:46:01 +0000 (13:46 +0200)]
lavfi/transpose: add passthrough option

7 years agolavfi/transpose: add support to named options and shortands
Stefano Sabatini [Sun, 30 Sep 2012 11:03:08 +0000 (13:03 +0200)]
lavfi/transpose: add support to named options and shortands

Allow extensibility.

7 years agotiffenc: Check av_malloc() results.
Alex Converse [Wed, 19 Sep 2012 18:12:58 +0000 (11:12 -0700)]
tiffenc: Check av_malloc() results.

7 years agotiffenc: Simplify pixel format setup using AVPixFmtDescriptor.
Alex Converse [Wed, 19 Sep 2012 18:10:26 +0000 (11:10 -0700)]
tiffenc: Simplify pixel format setup using AVPixFmtDescriptor.

7 years agoLibspeex VAD support
Dmitry Samonenko [Sat, 29 Sep 2012 11:47:28 +0000 (15:47 +0400)]
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>
7 years agoffmpeg: print muxed packet sizes in debug output too
Michael Niedermayer [Tue, 2 Oct 2012 00:14:02 +0000 (02:14 +0200)]
ffmpeg: print muxed packet sizes in debug output too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agonutenc: choose for non audio streams a timebase with finer resolution.
Michael Niedermayer [Mon, 1 Oct 2012 21:51:35 +0000 (23:51 +0200)]
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>
7 years agonut: store and read the r_frame_rate
Michael Niedermayer [Mon, 1 Oct 2012 22:41:40 +0000 (00:41 +0200)]
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>
7 years agonutenc: use 1/sample rate as timebase for audio instead of framesize/sample rate
Michael Niedermayer [Mon, 1 Oct 2012 19:56:27 +0000 (21:56 +0200)]
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>
7 years agoisom: fix redundant redeclaration of ff_mov_read_chan().
Clément Bœsch [Sat, 29 Sep 2012 23:22:18 +0000 (01:22 +0200)]
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.

7 years agoUse atexit() instead of defining a custom exit_program() interface.
Diego Elio Pettenò [Wed, 5 Sep 2012 07:03:56 +0000 (07:03 +0000)]
Use atexit() instead of defining a custom exit_program() interface.

7 years agomsvc: Fix detection of VFW & Avisynth required libs
Derek Buitenhuis [Mon, 1 Oct 2012 18:39:30 +0000 (18:39 +0000)]
msvc: Fix detection of VFW & Avisynth required libs

It should be vfw32.lib with MSVC.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agolavfi/edgedetect: add missing minus in a comment.
Clément Bœsch [Mon, 1 Oct 2012 20:31:14 +0000 (22:31 +0200)]
lavfi/edgedetect: add missing minus in a comment.

7 years agolavfi: EBU R.128 scanner.
Clément Bœsch [Sat, 18 Aug 2012 01:26:07 +0000 (03:26 +0200)]
lavfi: EBU R.128 scanner.

7 years agoMove xGA font data from lavc to lavu.
Clément Bœsch [Sat, 22 Sep 2012 07:56:33 +0000 (09:56 +0200)]
Move xGA font data from lavc to lavu.

This needs to be accessible for libavfilter in the next commit.

7 years agoavformat: refactor avformat_write_header
Luca Barbato [Sun, 30 Sep 2012 22:49:18 +0000 (00:49 +0200)]
avformat: refactor avformat_write_header

Split away option settings, sanity checks and general setup.

7 years agoavformat: refactor avformat_write_header
Luca Barbato [Sun, 30 Sep 2012 22:49:17 +0000 (00:49 +0200)]
avformat: refactor avformat_write_header

Mostly cosmetic changes adding some intermediate to shorten the lines.

7 years agoavformat: split muxing functions from util.c
Luca Barbato [Sun, 30 Sep 2012 22:49:16 +0000 (00:49 +0200)]
avformat: split muxing functions from util.c

7 years agoadpcmdec: set AVCodec.sample_fmts
Justin Ruggles [Fri, 21 Sep 2012 14:33:56 +0000 (10:33 -0400)]
adpcmdec: set AVCodec.sample_fmts

7 years agotwinvq: use planar sample format
Justin Ruggles [Tue, 28 Aug 2012 19:29:40 +0000 (15:29 -0400)]
twinvq: use planar sample format

7 years agoralf: use planar sample format
Justin Ruggles [Tue, 28 Aug 2012 17:04:49 +0000 (13:04 -0400)]
ralf: use planar sample format

7 years agompc7/8: use planar sample format
Justin Ruggles [Tue, 28 Aug 2012 13:11:45 +0000 (09:11 -0400)]
mpc7/8: use planar sample format

7 years agoavconv: improve sample format negotiation for decoder request
Justin Ruggles [Sat, 25 Aug 2012 20:32:12 +0000 (16:32 -0400)]
avconv: improve sample format negotiation for decoder request

This takes into account planar vs. packed when comparing to find the closest
sample format match.

7 years agoiac/imc: use planar sample format
Justin Ruggles [Mon, 27 Aug 2012 16:58:25 +0000 (12:58 -0400)]
iac/imc: use planar sample format

7 years agodcadec: use float planar sample format
Justin Ruggles [Mon, 27 Aug 2012 15:43:34 +0000 (11:43 -0400)]
dcadec: use float planar sample format

7 years agocook: use planar sample format
Justin Ruggles [Mon, 27 Aug 2012 14:38:36 +0000 (10:38 -0400)]
cook: use planar sample format

7 years agoatrac3: use float planar sample format
Justin Ruggles [Sun, 26 Aug 2012 16:48:07 +0000 (12:48 -0400)]
atrac3: use float planar sample format

7 years agoapedec: output in planar sample format
Justin Ruggles [Sat, 25 Aug 2012 23:23:55 +0000 (19:23 -0400)]
apedec: output in planar sample format

7 years ago8svx: use planar sample format
Justin Ruggles [Mon, 27 Aug 2012 16:01:16 +0000 (12:01 -0400)]
8svx: use planar sample format

7 years agojpeglsdec: move pict debug log under correct if()
Michael Niedermayer [Mon, 1 Oct 2012 14:45:59 +0000 (16:45 +0200)]
jpeglsdec: move pict debug log under correct if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocpu: improve av_get_cpu_flags() doxy
Michael Niedermayer [Mon, 1 Oct 2012 14:41:37 +0000 (16:41 +0200)]
cpu: improve av_get_cpu_flags() doxy

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 1 Oct 2012 13:51:40 +0000 (15:51 +0200)]
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>
7 years agoOpus encoder using libopus
Nathan Caldwell [Sat, 29 Sep 2012 05:16:09 +0000 (23:16 -0600)]
Opus encoder using libopus

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agompegts: Drop pointless casting of hex_dump_debug arguments
Diego Biurrun [Mon, 1 Oct 2012 10:47:49 +0000 (12:47 +0200)]
mpegts: Drop pointless casting of hex_dump_debug arguments

7 years agoavformat: const correctness for av_hex_dump / av_hex_dump_log
Diego Biurrun [Mon, 1 Oct 2012 10:48:23 +0000 (12:48 +0200)]
avformat: const correctness for av_hex_dump / av_hex_dump_log

7 years agowmadec: Adjust debug printf argument length modifier
Diego Biurrun [Mon, 1 Oct 2012 10:46:41 +0000 (12:46 +0200)]
wmadec: Adjust debug printf argument length modifier

7 years agoavcodec: Convert some commented-out printf/av_log instances to av_dlog
Diego Biurrun [Tue, 21 Aug 2012 10:41:40 +0000 (12:41 +0200)]
avcodec: Convert some commented-out printf/av_log instances to av_dlog

7 years agoavcodec: Drop silly and/or broken printf debug output
Diego Biurrun [Tue, 25 Sep 2012 16:28:44 +0000 (18:28 +0200)]
avcodec: Drop silly and/or broken printf debug output

7 years agoavcodec: Drop some silly commented-out av_log() invocations
Diego Biurrun [Tue, 25 Sep 2012 15:19:34 +0000 (17:19 +0200)]
avcodec: Drop some silly commented-out av_log() invocations

7 years agoavformat: Convert some commented-out printf/av_log instances to av_dlog
Diego Biurrun [Tue, 21 Aug 2012 10:40:41 +0000 (12:40 +0200)]
avformat: Convert some commented-out printf/av_log instances to av_dlog

7 years agoavformat: Remove non-compiling and/or silly commented-out printf/av_log statements
Diego Biurrun [Tue, 21 Aug 2012 10:27:40 +0000 (12:27 +0200)]
avformat: Remove non-compiling and/or silly commented-out printf/av_log statements

7 years agoRemove some silly disabled code.
Diego Biurrun [Mon, 20 Aug 2012 23:03:08 +0000 (01:03 +0200)]
Remove some silly disabled code.

7 years agosmacker: read escape codes in single get_bits() call
Paul B Mahol [Sun, 30 Sep 2012 14:49:08 +0000 (14:49 +0000)]
smacker: read escape codes in single get_bits() call

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoac3dec: ensure get_buffer() gets a buffer for the correct number of channels
Justin Ruggles [Sat, 29 Sep 2012 15:31:35 +0000 (11:31 -0400)]
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
7 years agomovenc: fix edit list for the case of negative pts.
Michael Niedermayer [Sat, 29 Sep 2012 04:31:18 +0000 (06:31 +0200)]
movenc: fix edit list for the case of negative pts.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: drop unused variable
Michael Niedermayer [Sun, 30 Sep 2012 21:14:20 +0000 (23:14 +0200)]
sws: drop unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale: move main swscale wraper to swscale.c
Michael Niedermayer [Sun, 30 Sep 2012 21:09:45 +0000 (23:09 +0200)]
swscale: move main swscale wraper to swscale.c

It never belonged to swscale_unscaled.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoqt-faststart: simplify code by using FFMIN
Michael Niedermayer [Sun, 30 Sep 2012 19:53:26 +0000 (21:53 +0200)]
qt-faststart: simplify code by using FFMIN

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoqt-faststart: dont allocate a bigger buffer than needed
Michael Niedermayer [Sun, 30 Sep 2012 19:52:59 +0000 (21:52 +0200)]
qt-faststart: dont allocate a bigger buffer than needed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoqt-faststart: speedup
Jan Ehrhardt [Sun, 30 Sep 2012 19:32:26 +0000 (21:32 +0200)]
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>
7 years agolavfi/ashowinfo: check plane value before deferencing.
Clément Bœsch [Sun, 30 Sep 2012 18:58:01 +0000 (20:58 +0200)]
lavfi/ashowinfo: check plane value before deferencing.

7 years agoxtea: fix decryption with --enable-small
Giorgio Vazzana [Sun, 30 Sep 2012 16:47:10 +0000 (18:47 +0200)]
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>
7 years agoswscale: fix To{Y,UV} extern prototypes.
Clément Bœsch [Sat, 29 Sep 2012 22:52:40 +0000 (00:52 +0200)]
swscale: fix To{Y,UV} extern prototypes.

This fix a bunch of "assignment from incompatible pointer type" warnings
with GCC.

7 years agoAPIchanges: fill hashes.
Clément Bœsch [Sun, 23 Sep 2012 18:35:03 +0000 (20:35 +0200)]
APIchanges: fill hashes.

Also fix some dates (use the commit date instead of the author date).

7 years agoMove subrip/text API change info from Changelog to doc/APIchanges.
Clément Bœsch [Sun, 23 Sep 2012 18:21:26 +0000 (20:21 +0200)]
Move subrip/text API change info from Changelog to doc/APIchanges.

Note that a lavf bump was missing so I'm using 54.28.100 as a reference.

7 years agofft-test: fix order of operations for calculating the average error
Michael Niedermayer [Sun, 30 Sep 2012 17:30:48 +0000 (19:30 +0200)]
fft-test: fix order of operations for calculating the average error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovima: check packet size before initializing bitstream reader
Paul B Mahol [Sun, 30 Sep 2012 15:14:28 +0000 (15:14 +0000)]
vima: check packet size before initializing bitstream reader

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agovima: fix typo in license header
Paul B Mahol [Sun, 30 Sep 2012 15:06:57 +0000 (15:06 +0000)]
vima: fix typo in license header

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoxtea: move iv decrypt handling code into xtea_crypt_ecb()
Michael Niedermayer [Sun, 30 Sep 2012 15:46:37 +0000 (17:46 +0200)]
xtea: move iv decrypt handling code into xtea_crypt_ecb()

this simplifies things are avoids a temporary

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoxtea-test: test inplace decryption
Michael Niedermayer [Sun, 30 Sep 2012 15:36:01 +0000 (17:36 +0200)]
xtea-test: test inplace decryption

Based on test code by: Giorgio Vazzana <mywing81@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoxtea: fix CBC mode when src=dst
Giorgio Vazzana [Sun, 30 Sep 2012 14:00:19 +0000 (16:00 +0200)]
xtea: fix CBC mode when src=dst

In CBC mode, when src=dst and we are decrypting a block different
from the first one, we need to save the current block of ciphertext
(which will constitute the initialization vector for the next block)
before we overwrite it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoxtea-test: factorize test code
Michael Niedermayer [Sun, 30 Sep 2012 15:19:54 +0000 (17:19 +0200)]
xtea-test: factorize test code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoflac: use get_bits_longlong()
Paul B Mahol [Sun, 30 Sep 2012 14:05:04 +0000 (14:05 +0000)]
flac: use get_bits_longlong()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agotta: let samples declaration match cast
Paul B Mahol [Sun, 30 Sep 2012 13:25:08 +0000 (13:25 +0000)]
tta: let samples declaration match cast

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agobitstream: add get_bits_longlong() to support more than 32bits
Michael Niedermayer [Sun, 30 Sep 2012 00:39:55 +0000 (02:39 +0200)]
bitstream: add get_bits_longlong() to support more than 32bits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: disable buffering for stderr, needed for win32 runtime
The makemkv authors [Sun, 30 Sep 2012 13:02:03 +0000 (15:02 +0200)]
ffmpeg: disable buffering for stderr, needed for win32 runtime

Found in http://www.makemkv.com/download/ffmpeg/mmffmpeg-1.7.7.patch.gz

Commit message by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 30 Sep 2012 12:28:35 +0000 (14:28 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: avoid stuck buffer pointer in decode_nal_units
  mpeg12: fix the semantics of the int* parameter of decode()

Conflicts:
libavcodec/mpeg12.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'd9a2e87b1ce44cce23801e7ec6810f8bf994fa23'
Michael Niedermayer [Sun, 30 Sep 2012 12:10:25 +0000 (14:10 +0200)]
Merge commit 'd9a2e87b1ce44cce23801e7ec6810f8bf994fa23'

* commit 'd9a2e87b1ce44cce23801e7ec6810f8bf994fa23':
  mpeg12: move mpeg_decode_frame() lower
  avsdec: Set dimensions instead of relying on the demuxer.
  wmalosslessdec: Reset put bit buffer when num_saved_bits is reset.

Conflicts:
libavcodec/avs.c
libavcodec/mpeg12.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'd05f72c75445969cd7bdb1d860635c9880c67fb6'
Michael Niedermayer [Sun, 30 Sep 2012 11:52:48 +0000 (13:52 +0200)]
Merge commit 'd05f72c75445969cd7bdb1d860635c9880c67fb6'

* commit 'd05f72c75445969cd7bdb1d860635c9880c67fb6':
  dfa: improve boundary checks in decode_dds1()
  wmalosslessdec: Fix reading too many bits in decode_channel_residues()
  wmalosslessdec: fix a get_bits(0) in decode_ac_filter
  wmalosslessdec: make MCLMS arrays big enough for what is written into them.
  indeo4/5: check empty tile size in decode_mb_info().
  ivi_common: make ff_ivi_process_empty_tile() static.
  indeo5: check tile size in decode_mb_info().
  indeo3: fix out of cell write.

Conflicts:
libavcodec/dfa.c
libavcodec/indeo3.c
libavcodec/indeo5.c
libavcodec/ivi_common.c
libavcodec/wmalosslessdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffprobe: extend disposition printing support
Stefano Sabatini [Wed, 26 Sep 2012 10:30:08 +0000 (12:30 +0200)]
ffprobe: extend disposition printing support

This generalizes the previous work on disposition printing.

Disposition flags are shown in a dedicated section, which should improve
output intellegibility, extensibility and filtering operations.

This breaks output syntax with the recently introduced disposition
printing.

7 years agoffprobe: generalize nesting model for the XML writer
Stefano Sabatini [Fri, 28 Sep 2012 16:57:47 +0000 (18:57 +0200)]
ffprobe: generalize nesting model for the XML writer

Do not make use of ad-hoc "tags" code, introduce a new section flag
SECTION_FLAG_HAS_VARIABLE_FIELDS to deal with the tags in a
content-agnostic way.

This is required by the pending disposition change.

7 years agolavu/opt: cosmetic fixes forgotten in the previous patch.
Nicolas George [Sun, 30 Sep 2012 08:23:08 +0000 (10:23 +0200)]
lavu/opt: cosmetic fixes forgotten in the previous patch.

7 years agoopt: implement av_opt_set_from_string().
Nicolas George [Mon, 13 Aug 2012 14:39:56 +0000 (16:39 +0200)]
opt: implement av_opt_set_from_string().

It is similar to av_set_options_string() but accepts a list
of options that can be in shorthand: if the key is omitted
on the first fields, the keys from the shorthand list are
assumed, in order.

7 years agoget_bits_long: fix variable type
Michael Niedermayer [Sun, 30 Sep 2012 00:37:40 +0000 (02:37 +0200)]
get_bits_long: fix variable type

This fixes a theoretical signed overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocyuv: implement raw cyuv
Michael Niedermayer [Sat, 29 Sep 2012 21:58:50 +0000 (23:58 +0200)]
cyuv: implement raw cyuv

Fixes Ticket1620

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: avoid stuck buffer pointer in decode_nal_units
Jindřich Makovička [Sat, 29 Sep 2012 09:16:45 +0000 (11:16 +0200)]
h264: avoid stuck buffer pointer in decode_nal_units

When decode_nal_units() previously encountered a NAL_END_SEQUENCE,
and there are some junk bytes left in the input buffer, but no start codes,
buf_index gets stuck 3 bytes before the end of the buffer.

This can trigger an infinite loop in the caller code, eg. in
try_decode_trame(), as avcodec_decode_video() then keeps returning zeroes,
with 3 bytes of the input packet still available.

With this change, the remaining bytes are skipped so the whole packet gets
consumed.

CC:libav-stable@libav.org

Signed-off-by: Jindřich Makovička <makovick@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agodoc/fate: Move fate config example into doc subdirectory
Alexander Strasser [Sat, 15 Sep 2012 21:34:21 +0000 (23:34 +0200)]
doc/fate: Move fate config example into doc subdirectory

Be compatible with texi2html 5.0 which doesn't search relative
file names in search paths anymore.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
7 years agompeg12: fix the semantics of the int* parameter of decode()
Anton Khirnov [Sat, 29 Sep 2012 11:50:44 +0000 (13:50 +0200)]
mpeg12: fix the semantics of the int* parameter of decode()

It is got_output, not data_size.

7 years agompeg12: move mpeg_decode_frame() lower
Anton Khirnov [Sat, 29 Sep 2012 11:45:09 +0000 (13:45 +0200)]
mpeg12: move mpeg_decode_frame() lower

Avoids a forward declaration of decode_chunks().

7 years agoavsdec: Set dimensions instead of relying on the demuxer.
Michael Niedermayer [Fri, 20 Apr 2012 15:42:18 +0000 (17:42 +0200)]
avsdec: Set dimensions instead of relying on the demuxer.

The decode function assumes that the video will have those dimensions.

Fixes CVE-2012-2801

CC:libav-stable@libav.org

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agowmalosslessdec: Reset put bit buffer when num_saved_bits is reset.
Michael Niedermayer [Sat, 14 Apr 2012 14:32:56 +0000 (16:32 +0200)]
wmalosslessdec: Reset put bit buffer when num_saved_bits is reset.

Fixes CVE-2012-2799

CC:libav-stable@libav.org

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agodfa: improve boundary checks in decode_dds1()
Anton Khirnov [Sat, 29 Sep 2012 11:25:28 +0000 (13:25 +0200)]
dfa: improve boundary checks in decode_dds1()

Fixes CVE-2012-2798

CC:libav-stable@libav.org

7 years agowmalosslessdec: Fix reading too many bits in decode_channel_residues()
Anton Khirnov [Sat, 29 Sep 2012 17:16:32 +0000 (19:16 +0200)]
wmalosslessdec: Fix reading too many bits in decode_channel_residues()

Fixes a part of CVE-2012-2795

CC:libav-stable@libav.org

Based on a patch by Michael Niedermayer <michaelni@gmx.at>

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
7 years agowmalosslessdec: fix a get_bits(0) in decode_ac_filter
Michael Niedermayer [Sat, 14 Apr 2012 12:50:25 +0000 (14:50 +0200)]
wmalosslessdec: fix a get_bits(0) in decode_ac_filter

Fixes a part of CVE-2012-2795

CC:libav-stable@libav.org

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agowmalosslessdec: make MCLMS arrays big enough for what is written into them.
Michael Niedermayer [Sat, 14 Apr 2012 12:49:22 +0000 (14:49 +0200)]
wmalosslessdec: make MCLMS arrays big enough for what is written into them.

Fixes a part of CVE-2012-2795

CC:libav-stable@libav.org

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Anton Khirnov <anton@khirnov.net>