ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-17 12:03:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,347 Commits 37 Branches 400 Tags 505 MiB
ace0cfea60
Commit Graph

51347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Hendrik Leppkes
c3ebfcd6e1 mpegvideo: allocate hwaccel privdata after the frame buffer 
This ensures the hwaccel privdata does not leak when a frame buffer could
not be allocated (and toggle the assert when the frame is re-used).
Having no frame buffer available is quite common when using the DXVA2
hwaccel in situations where the DXVA2 renderer is being re-allocated, for
example when moving between displays.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-03-19 11:20:22 +01:00
Hendrik Leppkes
9c9ede44f3 h264: allocate hwaccel privdata after the frame buffer 
This ensures the hwaccel privdata does not leak when a frame buffer could
not be allocated (and toggle the assert when the frame is re-used).
Having no frame buffer available is quite common when using the DXVA2
hwaccel in situations where the DXVA2 renderer is being re-allocated, for
example when moving between displays.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-03-19 11:20:00 +01:00
Hendrik Leppkes
c71c80f53b pthread: unref already decoded frames when flushing the decoder 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-03-19 11:19:08 +01:00
Hendrik Leppkes
4e70d66ded mpegvideo: fix allocation of the hwaccel_picture_private data 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-03-19 11:18:42 +01:00
Anton Khirnov
6599b087de buffersrc: fix a typo. 
Vertical shift is log2_chroma_h, not log2_chroma_w.
 2013-03-19 11:12:17 +01:00
Anton Khirnov
2c328a9079 pixdesc: add a function for counting planes in a pixel format. 2013-03-19 11:12:17 +01:00
Anton Khirnov
1516bf7af1 lavc: update the doxy for avcodec_decode_{video,audio} wtih refcounting. 2013-03-19 11:12:17 +01:00
Anton Khirnov
c977039e58 lavc, lavfi: fix counting number of planes in AVBufferRef wrappers 
Number of planes is not always equal to the number of components even
for formats marked with PIX_FMT_PLANAR -- e.g. NV12 has three components
in two planes.
 2013-03-19 11:12:17 +01:00
Anton Khirnov
e5c32d6da7 avplay: remove the -debug option. 
It just shadows the corresponding AVOption and prevents using named
constants.
 2013-03-19 11:12:13 +01:00
Anton Khirnov
3cd93cc7b8 Revert "asfenc: return error on negative timestamp" 
This reverts commit d1bec33b46, it breaks
FATE.
 2013-03-19 11:04:55 +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
Michael Niedermayer
c603f22683 avutil/get_pool: remove dead operations whichs result is never used. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-17 18:40:15 +01:00
Michael Niedermayer
e3be7b1159 avutil/get_pool: Remove redundant initial atomic operation 
602->442 dezicycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-17 18:40:15 +01:00
Nicolas George
ec7fc7b7d1 fate: add a test for -filter_complex / -lavfi without input. 2013-03-17 16:24:43 +01:00
Nicolas George
40ea006b76 ffmpeg: make -lavfi an alias for -filter_complex. 2013-03-17 16:24:43 +01:00
Richard
9cde9f70ab mpeg: Add passing DVD navigation packets (startcode 0x1bf) to caller to allow better playback handling of DVDs. 
The two types of packets (PCI and DSI) are passed untouched but combined by the new codec ID AV_CODEC_ID_DVD_NAV.
 The first 980 bytes in the packet contain the PCI data. The next 1018 are the DSI data.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-17 16:24:34 +01:00