virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity
50,496 Commits 39 Branches 425 Tags
9b211c43dc5f2e618f204c4a7fd184eb2ea51f02
Commit Graph
50496 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas George 9b211c43dc examples/muxing: fix memory leak. 
Do not re-call avcodec_get_context_defaults3(), it is already
called by avformat_new_stream() and it leaks the codec
priv_data that was already allocated.

Use avformat_free_context() instead of freeing (not)
everything manually.

Fix trac ticket #2322.
 2013-03-05 15:43:32 +01:00
Stefano Sabatini ad48556135 lavu/eval: add native support to lte and lt functions 2013-03-05 15:15:45 +01:00
Nicolas George 622a6f6f3b doc/muxers: specify that tee needs -map. 
Address trac ticket #2311.
 2013-03-05 14:20:18 +01:00
Nicolas George 3ab25e4574 Revert "lavf/concatdec: define "ffcat" and "ffconcat" extensions" 
This reverts commit 6cc12353a8.

Conflicts:
	libavformat/version.h

Allowing to automatically select the concat demuxer raises
security concerns, as it allows a possibly hostile file to
access any file on the system. Guessing the format based on
the file name extension does not allow to enable the safe
mode designed to avoid it.
 2013-03-05 14:10:10 +01:00
Stefano Sabatini b1a2684936 lavu/opt: fix weird align 2013-03-05 13:20:14 +01:00
Stefano Sabatini 7b9a3df5d7 lavu/opt-test: do not explicitly set default value in test_ctx 
Let av_opt_set_defaults() set the value, which is simpler and more
idiomatic.
 2013-03-05 13:20:14 +01:00
Stefano Sabatini aba18c5af9 tests: add overlay rgb and yuv444 tests 
Also rename overlay test to overlay_yuv420 accordingly.
 2013-03-05 13:20:13 +01:00
Alexander KojevnikovandMichael Niedermayer 29d8cd265a mp3dec: Fix VBR bit rate parsing 
When parsing the Xing/Info tag, don't set the bit rate if it's an Info tag.

When parsing the stream, don't override the bit rate if it's already set,
otherwise calculate the mean bit rate from parsed frames. This way, the bit
rate will be set correctly both for CBR and VBR streams.

Signed-off-by: Alexander Kojevnikov <alexander@kojevnikov.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-05 13:06:01 +01:00
Paul B Mahol d2b0b839b9 fate: add dependency for xface 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-05 11:44:58 +00:00
Michael Niedermayer 1567095acf Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: Use check_builtin() where appropriate

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-05 12:37:15 +01:00
Michael Niedermayer 1cb3ca2a67 Merge commit '9c7d85b3b45a77742b1e69c48ab33f9c8a2e6f35' 
* commit '9c7d85b3b45a77742b1e69c48ab33f9c8a2e6f35':
  configure: Add check_builtin convenience function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-05 12:23:48 +01:00
Michael Niedermayer 890b9c5c46 Merge commit 'f868b24d0f280bb966e5c352028a343e45d20a02' 
* commit 'f868b24d0f280bb966e5c352028a343e45d20a02':
  configure: Add sanitize_var_name convenience function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-05 12:17:15 +01:00
Michael Niedermayer 06ad309ab4 Merge commit '813b82b927b19532e3bc3397b972c8a27b9f6326' 
* commit '813b82b927b19532e3bc3397b972c8a27b9f6326':
  configure: Fix silly typo in logging command of check_struct()
  fate: remove last incomplete frame from mpeg2-field-enc test

Conflicts:
	tests/fate/video.mak
	tests/ref/fate/mpeg2-field-enc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-05 12:11:48 +01:00
Paul B Mahol d7f9f34dc6 zmbv: stop doing colorspace conversion 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-05 10:27:09 +00:00
Paul B Mahol f5ce359ce4 doc/filters: fix short options for noise filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-05 10:18:21 +00:00
Diego Biurrun 2a7ab2dfaa configure: Use check_builtin() where appropriate 2013-03-05 11:04:37 +01:00
Diego Biurrun 9c7d85b3b4 configure: Add check_builtin convenience function 2013-03-05 11:04:37 +01:00
Diego Biurrun f868b24d0f configure: Add sanitize_var_name convenience function 
This is useful in all the places where special characters in
variable names are manually translated to underscores.
 2013-03-05 11:04:37 +01:00
Diego Biurrun 813b82b927 configure: Fix silly typo in logging command of check_struct() 2013-03-05 11:04:37 +01:00
Michael Niedermayer 715c230811 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Add h264chroma dependency for mpegvideo / lowres to configure.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-05 04:25:01 +01:00
Michael Niedermayer e398990eb8 msrledec: fix output_end checks 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-05 03:29:04 +01:00
Michael Niedermayer 3dbc0ff9c3 iff: fix integer overflow 
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-05 01:39:50 +01:00
Carl Eugen Hoyos d043461344 Add h264chroma dependency for mpegvideo / lowres to configure. 
Fix building for some unusual configurations.
 2013-03-05 01:07:12 +01:00
Michael Niedermayer 7992bdbeb4 update_stream_timings: check bitrate for being in range. 
Fixes numerical overflow
Fixes Ticket2089

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-04 18:54:00 +01:00
Michael Niedermayer dae38a66eb dnxhddec: return the correct number of bytes from decode_frame 
Fixes Ticket2022

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-04 18:17:47 +01:00
Michael Niedermayer faa0068a87 avformat: Make duration estimation from pts more robust 
Ignore durations which differ significantly from the previous
Fixes Ticket2018

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-04 18:01:32 +01:00
Michael Niedermayer 9bb54bb685 nutdec: more specific return codes for decode_syncpoint() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-04 16:51:21 +01:00
Michael Niedermayer 7ccc0ed6a0 nutdec: print error on invalid/unsupported fourcc style 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-04 16:49:17 +01:00
Michael Niedermayer 144da7eeca Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  buildsys: only include log2_tab per library for shared builds
  Add h264chroma dependency for cavs decoder to configure.
  Add h264qpel dependency for snow codec to configure.
  Add h264chroma dependency for vp5 and vp6 decoder to configure.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-04 14:45:52 +01:00
Clément Bœsch 53ca0cb8d4 build: [autodetect] -> [no] in iconv help. 2013-03-04 13:12:45 +01:00
Michael NiedermayerandCarl Eugen Hoyos 03148fd174 buildsys: only include log2_tab per library for shared builds 
Fix linking failures with -all_load due to multiple log2_tabs

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2013-03-04 12:25:02 +01:00
Carl Eugen Hoyos 523b12affc Add h264chroma dependency for cavs decoder to configure. 
Fix building for some unusual configurations.
 2013-03-04 11:43:55 +01:00
Carl Eugen Hoyos 9051e297d2 Add h264qpel dependency for snow codec to configure. 
Fix building for some unusual configurations.
 2013-03-04 11:43:09 +01:00
Carl Eugen Hoyos 2b09078a61 Add h264chroma dependency for vp5 and vp6 decoder to configure. 
Fix building for some unusual configurations.
 2013-03-04 11:39:44 +01:00
Janne Grunau 15ea1ac695 fate: remove last incomplete frame from mpeg2-field-enc test 2013-03-04 11:22:21 +01:00
Clément Bœsch 393dcbf079 compat/strtod: isspace -> av_isspace. 
This should fix build after 88d55b8.
 2013-03-04 03:37:36 +01:00
Clément Bœsch 9ad3cd5b5f build: disable iconv by default. 
It seems to break a lot on MacOS because of a mixup between multiple
iconv libraries. The issue is that the configure check link with no
particular library path (so it uses /usr/lib/libiconv.dylib where all
the symbols are defined). OTOH, the final build might link with extra
library paths, such as the ports lib directory (typically you get
-L/opt/local/lib because of an extra library such as SDL). Whatever this
option position (before or after -liconv), it will try to link with
/opt/local/lib/libiconv.dylib, and the issue is that this version has
the same symbols as the ones in /usr/lib/libiconv.dylib except that they
all start with 'lib' (libiconv_open, libiconv_close, ...). I don't plan
to try to workaround this mess, so any better solution is welcome.
 2013-03-03 23:50:31 +01:00
Clément Bœsch 16ed6a6bf7 doc/filters: fix degrees/radians copy/paste fail. 2013-03-03 23:49:46 +01:00
Michael Niedermayer e2427f04b7 ffmpeg_opt: Ask for overwrite in single image2 files too 
Fixes Ticket1637

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 22:09:01 +01:00
Clément Bœsch 14e240cb4a lavfi/opencv: isgraph -> av_isgraph. 
Fix build after 88d55b8.
 2013-03-03 22:06:48 +01:00
Reimar Döffinger 88d55b827d Remove incorrect use of ctype.h functions. 
As far as I can tell the code should not change behaviour
depending on locale in any of these places.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-03-03 21:44:10 +01:00
Ronald S. BultjeandMichael Niedermayer 2cffe38df3 Deprecate deinterlaced in libavcodec. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 21:11:48 +01:00
Michael Niedermayer 9af8179cdb ffmpeg: fix -stats -v 0 
Fixes Ticket1687

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 19:38:13 +01:00
Michael Niedermayer f2cb993139 avformat: gather aspect ratio from rv30/40 in find_stream_info 
Fixes Ticket1550

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 18:41:16 +01:00
Michael Niedermayer d210e9741e rv34: fix aspect ratio 
Fixes part of Ticket1550

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 18:40:57 +01:00
Michael Niedermayer 6c6dc8ccea wmadec: check nb_frames 
Improves error message for Ticket968

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 16:50:47 +01:00
Michael Niedermayer 3fac99cd9d Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  movenc: Do not flag secondary audio and subtitle tracks as enabled.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 14:05:09 +01:00
Ronald S. BultjeandMichael Niedermayer d98aa7cdc1 h264: put call to ff_print_debug_info2 under CONFIG_MPEGVIDEO. 
The code is located in mpegvideo, and it's likely that in a minimal
config, we don't want to include debug info anyway.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 12:19:29 +01:00
Ronald S. BultjeandMichael Niedermayer d4e649cca6 h264: make it possible to compile without error_resilience. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-03 12:19:15 +01:00
Michael NiedermayerandCarl Eugen Hoyos 981cf0c300 movenc: Do not flag secondary audio and subtitle tracks as enabled. 
Fixes ticket #468 and ticket #1174.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2013-03-03 12:09:38 +01:00