ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-24 23:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,740 Commits 37 Branches 398 Tags 539 MiB
4390f8c28d
Commit Graph

44740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
3db4c88ac1 ffmpeg/opt_preset: update to new option API for reading codec names. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-22 18:16:49 +02:00
Michael Niedermayer
bad953bc2d ffmpeg: fix overriding codecs with the new syntax 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-22 17:56:35 +02:00
Justin Ruggles
0ccf051a9d avcodec: fix memleak in avcodec_encode_audio2() 
Ensure that padded_frame is freed before returning when needed.
 2012-09-22 09:24:24 -04:00
Michael Niedermayer
8364bde02b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  sipr: fall back to setting mode based on bit_rate.

Conflicts:
	libavcodec/sipr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-22 14:04:44 +02:00
Michael Niedermayer
79bf1f0ad0 rawdec: fix "warning: assignment from incompatible pointer type" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-22 13:48:40 +02:00
Andrew Wason
225efccefc lavfi/buffersink: fix check on pixel_fmts in the opaque parameter 
Fix programmatic selection of accepted pixel formats.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2012-09-22 10:59:40 +02:00
Stefano Sabatini
ab4ee9fd5e tests: update fate-ffprobe test to make use of -bitexact flag 
Should fix tests with --enable-small.
 2012-09-22 09:34:56 +02:00
Stefano Sabatini
42047c3e86 ffprobe: reindent after the previous commit 2012-09-22 09:34:56 +02:00
Stefano Sabatini
4cd1addcc4 ffprobe: add -bitexact boolean option 
The option is mostly useful to make ffprobe output independent from the
build, and in particular to fix FATE --enable-small failures.
 2012-09-22 09:34:56 +02:00
Michael Niedermayer
07cdd39478 pnmdec: use explicit casts to remove const to avoid warning with clang 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-22 04:51:47 +02:00
Michael Niedermayer
28e88a24f6 rtsp: fix "warning: ret may be used uninitialized in this function" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-22 04:49:04 +02:00
Michael Niedermayer
0079232299 rtsp: kill a pointer type warning (void **) vs. (AVFormatContext **) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-22 04:45:12 +02:00
Michael Niedermayer
8d45c001a8 flac_parser: fix fifo ptr wrap check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-22 04:40:10 +02:00
Loren Merritt
1b1b902e2c hqdn3d: Fix out of array read in LOWPASS 
Fixes ticket1752

Commit message by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-22 03:17:28 +02:00
Clément Bœsch
ea5bd7ea6f lavf/oggdec: check for begin-of-stream flag in case of chained streams. 
Fix Ticket #1617, revealing a regression I introduced in 8f3eebd.

We need to make sure no stream is added in between Ogg context save and
restore operations (because it would likely lead to a mismatch between
ogg->nstreams and AVFormatContext->nb_streams after the restore op).
This is the reason the ogg->state check is added in ogg_new_stream().
Before this patch, checking for ogg->headers was preventing this:
ogg->headers is always set before any ogg save/restore (though, it was
also preventing from creating the stream when necessary).
 2012-09-22 00:40:51 +02:00
Reimar Döffinger
c54e00610f sipr: fall back to setting mode based on bit_rate. 
Not all applications (e.g. MPlayer) set block_align, and
when using a different demuxer it might not even be
easily available.
So fall back to selecting mode based on bit rate as before
if block_align has not useful value.
It can't be worse than failing to decode completely.

(cherry picked from commit 1d0d63052b)

CC: libav-stable@libav.org
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2012-09-21 20:11:23 +02:00
Clément Bœsch
405ee405c9 ffmpeg: complete mov/mp4 based timebase hack with "f4v" format. 2012-09-21 17:27:57 +02:00
Matthieu Bouron
41f7e0649f mxf: export ff_mxf_get_samples_per_frame to lavf 
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-21 16:20:38 +02:00
Clément Bœsch
7bc70930dd lavf/movenc: add F4V flavor. 2012-09-21 15:14:11 +02:00
Michael Niedermayer
406cdddbdd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  libx264: add forgotten ;
  matroskadec: fix a sanity check.
  matroskadec: only return corrupt packets that actually contain data
  lavf: zero data/size of the packet passed to read_packet().
  ARM: use 2-operand syntax for ADD Rd, PC in Apple PIC code
  ARM: align PIC offset pools to 4 bytes
  ARM: swap source operands in some add instructions
  configure: update tms470 detection for latest version
  lavf probe: prevent codec probe with no data at all seen
  motion_est: fix use of inline on extern functions

Conflicts:
	libavcodec/motion_est_template.c
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-21 14:44:32 +02:00
Stefano Sabatini
9543cd593e ffprobe: print format long_name only if non-NULL 
Fix possible crash when long_name is not defined (for example if
--enable-small).
 2012-09-21 13:59:18 +02:00
Stefano Sabatini
3aa1b53256 lavfi/hue: set to NULL freed pointers 
Possibly safer.
 2012-09-21 12:44:44 +02:00
Stefano Sabatini
31aa5b1a78 lavfi/hue: fix crash when resetting the saturation expression 
Previously when saturation was reinited, the old value was freed when
setting options, and freed again in PARSE_EXPRESSION().
 2012-09-21 12:43:52 +02:00
Stefano Sabatini
0f40105aaa ffprobe: print codec_long_name only when available 
Avoid possible segmentation fault if codec_long_name is defined as
NULL (for example if --enable-small).
 2012-09-21 09:27:06 +02:00
Anton Khirnov
e52e4fe10d libx264: add forgotten ; 2012-09-21 09:20:09 +02:00
Anton Khirnov
87b017a298 matroskadec: fix a sanity check. 2012-09-21 09:15:07 +02:00
Anton Khirnov
bdb939ad73 matroskadec: only return corrupt packets that actually contain data 
Fixes bug 372.
 2012-09-21 09:15:01 +02:00
Anton Khirnov
1cc569ddda lavf: zero data/size of the packet passed to read_packet(). 2012-09-21 09:14:37 +02:00
Mans Rullgard
8995d34972 ARM: use 2-operand syntax for ADD Rd, PC in Apple PIC code 
The Apple assembler refuses to assemble the 3-operand form
in Thumb2 even though it is valid syntax.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-09-21 07:07:58 +01:00
Mans Rullgard
cdb7db5acd ARM: align PIC offset pools to 4 bytes 
When building Thumb2 code, the end of a function, where the PIC
offsets are placed, need not be aligned.  Although the values
are only accessed with instructions allowing unaligned addresses,
keeping them aligned is preferable.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-09-21 07:07:58 +01:00
Michael Niedermayer
fb96ac469a nutdec: fix mixup of nb_streams and timebase_count 
Fixes out of array read, should fix ffprove fate failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-21 06:29:24 +02:00
Michael Niedermayer
6ab1166c77 nutdec: fix type of intermediate variable for ts calculation. 
Prior to this it could theoretically become negative and read
out of array.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-21 06:27:38 +02:00
Michael Niedermayer
3dc24600ba vsrc_testsrc: Fix case without a specified duration 
Fixes regression since 98f753ec51

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-21 03:00:15 +02:00
Andrey Utkin
cc07a7925e Add av_copy_packet() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-21 01:03:31 +02:00
Andrey Utkin
d33908a5fc Move av_dup_packet() copy logic to separate procedure 
Done to simplify next commit introducing av_copy_packet()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-21 00:49:12 +02:00
Michael Niedermayer
a6ec1e49f6 matroskadec: matroska_parse_rm_audio: remove unused parameter 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-20 23:43:20 +02:00
Michael Niedermayer
6d87781758 mp3dec: fix seeking without xing TOC 
fixes regression from the xing toc support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-20 22:00:52 +02:00
Michael Niedermayer
5864ce13d1 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mp3dec: read Xing frame TOC index
  mp3dec: use named constants for Xing header flags
  libx264: add support for nal-hrd, required for Blu-ray streams.
  mov: support random access point grouping
  matroskadec: properly support BlockDuration

Conflicts:
	libavcodec/libx264.c
	libavformat/isom.h
	libavformat/matroskadec.c
	libavformat/mov.c
	libavformat/mp3dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-20 21:46:35 +02:00
Michael Niedermayer
8c51ea5489 Merge commit 'c831ebf61629d219ebcaa9f02d262e67aad09d83' 
* commit 'c831ebf61629d219ebcaa9f02d262e67aad09d83':
  matroskadec: split frame parsing
  matroskadec: split laces parsing

Conflicts:
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-20 20:39:47 +02:00
Michael Niedermayer
b8044972c4 Merge commit '117d8c6d1f1c187ffc6098d9618457e00534e013' 
* commit '117d8c6d1f1c187ffc6098d9618457e00534e013':
  matroska: implement support for ProRes
  matroska: implement support for ALAC

Conflicts:
	libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-20 19:43:38 +02:00
Michael Niedermayer
0da50055eb matroskadec: fix typo 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-20 19:12:07 +02:00
Michael Niedermayer
6902c3acb0 Merge commit '870e75524aa0d00ebcd1d15589c8d29b84af1565' 
* commit '870e75524aa0d00ebcd1d15589c8d29b84af1565':
  matroskadec: validate lace_size when parsed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-20 19:11:46 +02:00
Clément Bœsch
2f39d7ff3f lavfi/select: make lavc dependency optional. 2012-09-20 18:45:47 +02:00
Mans Rullgard
a27a690fac ARM: swap source operands in some add instructions 
This allows using a 16-bit opcode when generating Thumb2 code.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-09-20 17:07:18 +01:00
Mans Rullgard
0122118ec3 configure: update tms470 detection for latest version 
v5.0 of the TI ARM compiler changes the version string.
This updates the detection to check for both the old and
the new strings.

Signed-off-by: Mans Rullgard <mans@mansr.com>
 2012-09-20 14:56:56 +01:00
Janne Grunau
6746cd7f61 lavf probe: prevent codec probe with no data at all seen 
This occurs with fuzzed mpeg-ts files. set_codec_from_probe_data() is
called with a zeroed AVProbeData since no packet made through for
specific stream.
 2012-09-20 14:50:06 +02:00
Michael Niedermayer
a16c512374 Merge commit 'c9a39cec70603f662f4c326b21b11c4f0112079a' 
* commit 'c9a39cec70603f662f4c326b21b11c4f0112079a':
  matroskadec: return meaningful errors in matroska_decode_buffer
  matroskadec: fix incorrect unsigned->signed conversion

Conflicts:
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-20 13:40:47 +02:00
Michael Niedermayer
1df2e3c707 Merge commit '8d4dd55c37b14ecea596f3477b35bf6c20688d8b' 
* commit '8d4dd55c37b14ecea596f3477b35bf6c20688d8b':
  matroskadec: refactor matroska_decode_buffer

Conflicts:
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-20 13:32:43 +02:00
jamal
33f92a3ea2 configure: fix git domain check with out of tree build 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-20 12:54:09 +02:00
Michael Niedermayer
db0087dc1d mxfdec: fix index_tables check in mxf_read_seek() 
Approved-by: Tjoppen
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-20 12:54:00 +02:00