virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
51,102 Commits 37 Branches 400 Tags 465 MiB
18f43de964
Commit Graph

51102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefano Sabatini
18f43de964 doc/ffmpeg,ffmpeg-formats: avoid to mention ffmpeg options from formats.texi 
Also extends documentation for timestamp related ffmpeg options, in order
to make more apparent the fact that muxer processing may change the
timestamps values.
 2013-03-19 17:31:16 +01:00
Stefano Sabatini
2bac6b6f5e doc/ffmpeg-formats: reword and extend documentation for avoid_negative_ts option 
Hopefully increase readability.
 2013-03-19 17:31:16 +01:00
Stefano Sabatini
608bccf470 lavf/avformat.h: fix a few typos in AVFormatContext:avoid_negative_ts doxy 2013-03-19 17:31:16 +01:00
Nedeljko Babic
d23aefa498 mips: inline assembly clobber list polishing 
List of clobbered registers fixed and added where it is lacking.

Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-19 16:51:35 +01:00
Michael Niedermayer
4ce03a95e2 lmlm4: check packet_size against lower limit too 
Fixes CID732224

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-19 16:30:44 +01:00
Michael Niedermayer
d275f6eda8 doc: update release_notes by taking the ones from release/1.2 2013-03-19 16:21:26 +01:00
Clément Bœsch
bf0e44fa67 fate: add curves filter test. 2013-03-19 16:20:22 +01:00
Michael Niedermayer
feeb8ca56d vp56: Check av_frame_ref() return code 
Fixes CID991837

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-19 15:26:23 +01:00
Michael Niedermayer
5f476cfe6e avformat/tee: add forgotten ret assignment 
Fixes CID991840
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-19 15:09:10 +01:00
Michael Niedermayer
1e41b8cd07 hpeldsp: Increase put_no_rnd_pixels_tab[][] size 
Fixes CID991852

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-19 14:47:04 +01:00
Clément Bœsch
21aa4fafcd fate: add ebur128 metadata test. 2013-03-19 14:37:59 +01:00
Michael Niedermayer
2c993fece2 audio_get_buffer: add assert to ensure nb_extended_buf has a safe value 
May silence CID991853

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-19 14:33:47 +01:00
Michael Niedermayer
fdda9b440c matroska_parse_frame: fix memleak 
Fixes CID991856
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-19 14:33:47 +01:00
Clément Bœsch
dec9800c9d lavf: do not make a hard dep on internal subtitles helpers. 2013-03-19 14:10:24 +01:00
Michael Niedermayer
ad98567198 mpegvideo_enc: remove stray semicolon 
Fixes CID991857
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-19 13:47:04 +01:00
Michael Niedermayer
f1c3d8b344 avutil/add_to_pool: remove unused assgnment 
Fixed CID991859
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-19 13:35:10 +01:00
chinshou
b619a54853 alac: Fix order of values in comment 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-19 13:28:29 +01:00
Michael Niedermayer
8d0da20ca6 avidec: fix duration and bitrate of truncated files 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-19 13:09:52 +01:00
Paul B Mahol
4d16ba2dd8 ffplay: silence warning of mixed enumeration types 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-19 09:39:28 +00:00
Matthieu Bouron
69e93792d6 lavf/mxfdec: read field dominance flag 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-19 03:01:51 +01:00
Hendrik Leppkes
97f8c6e147 pthread: update all get_buffer checks for get_buffer2 
This restores the performance of simple frame-threaded codecs back to
their pre-merge levels.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-19 02:25:46 +01:00
Carl Eugen Hoyos
55bb8f4589 Fix Makefile dependency for the dvd_nav parser. 
Fixes compilation for --disable-everything --enable-parser=dvd_nav
 2013-03-19 02:11:39 +01:00
Carl Eugen Hoyos
e4f5aa5e8d Inform the user if a pix_fmt != yuv420p was chosen for x264 encoding. 2013-03-19 01:16:37 +01:00
Michael Niedermayer
6128d33946 AVFrame.pkt_dts: improve docs 
Related to Ticket2375

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-19 00:47:00 +01:00
Michael Niedermayer
0e02a5193f segment: copy metadata 
Fixes Ticket2230

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-18 23:57:44 +01:00
Thierry Foucu
823efd9286 Fix termination of mov_ch_layouts_wav array lookup 
Problem found using ASAN.
In some case, the ff_mov_get_channel_layout_tag function will not find 0
as termination for lookup in the array mov_ch_layouts_wav.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-18 23:50:35 +01:00
Michael Niedermayer
9c22039c15 doc: Document the order in which avoid_negative_ts is applied compared to other timestamp options 
Also try to document the rational behind it.

This might fix Ticket2376

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-18 23:19:54 +01:00
Michael Niedermayer
aafbfb1c2e doc: try to improve avoid_negative_ts documentation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-18 23:09:26 +01:00
Clément Bœsch
4b35be3251 lavc: fix avpacket memleak with subtitles recoding. 2013-03-18 22:04:29 +01:00
dronus
fdca977a22 libavdevice sdl: added window_fullscreen option to switch SDL output into fullscreen mode 2013-03-18 20:44:21 +01:00
Elvis Presley
58bc65952b libavcodec/proresdec.h: fix license header 
This was somehow missed when relicensing the decoder to LGPL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-18 19:34:41 +01:00
Michael Niedermayer
cea3a63ba3 avutil/buffer: Fix race in pool. 
This race will always happen sooner or later in a multi-threaded
environment and it will over time lead to OOM.
This fix works by spinning, there are other ways by which this
can be fixed, like simply detecting the issue after it happened
and freeing the over-allocated memory or simply using a mutex.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-18 19:19:22 +01:00
Michael Niedermayer
73ef12757b append_packet_chunked: remove outcommented code 
our variant works fine and should be better
also remove related unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-18 17:54:01 +01:00
Michael Niedermayer
0163ad66e1 mpeg2: 12LSB w/h of 0 is not allowed in compliant videos thus this also needs AV_EF_COMPLIANT 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-18 17:48:52 +01:00
Michael Niedermayer
330e440706 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  print_options: do not generate docs for options without enc or dec flags
  mpeg12: do not fail on zero dimensions in the sequence header.

Conflicts:
	libavcodec/mpeg12.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-18 17:43:43 +01:00
Michael Niedermayer
523c8e0503 Merge commit '50c449ac24fbb4c03c15d2e2026cef2204b80385' 
* commit '50c449ac24fbb4c03c15d2e2026cef2204b80385':
  iff: validate CMAP palette size
  asfenc: return error on negative timestamp

Conflicts:
	libavformat/iff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-18 17:30:53 +01:00
Anton Khirnov
358628074c print_options: do not generate docs for options without enc or dec flags 
Those are not usable from the avtools, so mentioning them in the
manpages just confuses the reader.
 2013-03-18 15:36:25 +01:00
Anton Khirnov
ce0124acac mpeg12: do not fail on zero dimensions in the sequence header. 
The total frame size is a combination of the 12 bits in the sequence
header and 2 more bits in the the sequence extension. While the
specification explicitly forbids the dimensions from the sequence header
from being 0 (thus ruling out multiples of 4096), such videos
apparrently exist in the wild so we should attempt to decode them.

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

Fixes Bug 416.
 2013-03-18 15:36:10 +01:00
Kostya Shishkov
50c449ac24 iff: validate CMAP palette size 
Fixes CVE-2013-2495

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

CC: libav-stable@libav.org
 2013-03-18 10:48:29 +01:00
Luca Barbato
d1bec33b46 asfenc: return error on negative timestamp 
According to the specification the timestamp is represented by a 32bit
unsigned.

CC: libav-stable@libav.org
 2013-03-18 10:48:23 +01:00
Clément Bœsch
6abb554fd6 lavc,lavu: fix two doxy mixup between h/v chroma shift. 2013-03-18 09:04:11 +01:00
Clément Bœsch
c10b57973d lavfi/pad: fix horizontal/vertical shift confusion. 2013-03-18 08:51:55 +01:00
Michael Niedermayer
fbd3ee91a5 avutil/frame: typo 
found by ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-18 04:47:27 +01:00
Michael Niedermayer
3dc25c3ab2 avutil/frame: document alignment and padding requirements 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-18 04:13:21 +01:00
Clément Bœsch
76d1c07c89 lavfi/ebur128: add metadata injection. 2013-03-18 03:21:08 +01:00
Michael Niedermayer
29e0357a11 aasc: fix pointer vs value error 
Fixes Ticket2365

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-18 02:10:10 +01:00
Michael Niedermayer
8152451b56 buffersrc: fix w/h error 
Found-by: nevcairiel
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-18 02:00:57 +01:00
Michael Niedermayer
519ebb5ee5 rmdec: flush audio packet on seeking 
Fixes Ticket1605

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-18 00:08:59 +01:00
Michael Niedermayer
ef3c88838e doc/developer: Add "security fixes" to the release process steps 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-17 22:53:28 +01:00
Michael Niedermayer
36258f9829 Merge remote-tracking branch 'cigaes/master' 
* cigaes/master:
  fate: add a test for -filter_complex / -lavfi without input.
  ffmpeg: make -lavfi an alias for -filter_complex.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-17 21:55:27 +01:00