virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity
61,100 Commits 38 Branches 411 Tags
636273d3d4a8c42f51832e8bf83e566e875916bf
Commit Graph

61100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
6904168c79 avcodec/mjpegdec: Print error in case of CMYK 
Also fail if AV_EF_EXPLODE is set.
We do not fail by default, but rather return some image as it may be usefull to the
end user to see what is on the image, for example text could be read quite fine and
objects recognized.

Possibly fixes Ticket3424

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-27 20:24:39 +01:00
Michael Niedermayer
681e72a668 avcodec/mjpegdec: parse adobe_transform 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-27 20:13:48 +01:00
Michael Niedermayer
7e8be7081f avcodec/mjpegdec: Print human readable string for APPx 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-27 19:35:37 +01:00
Carl Eugen Hoyos
3ba056017f Fix http authentication. 
Add parenthesis around "MD5" in the request string as required by
RFC 2069.

Fixes ticket #3417.

Reported and tested by Haarman
Analyzed-by: Eugen-Andrei Gavriloaie
 2014-02-27 16:56:30 +01:00
Michael Niedermayer
4f4cc43fd8 avcodec/h264: allow mixing idr and non idr slices with frame threading again 
This combination exists in the wild
Fixes Ticket3131

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-27 15:49:25 +01:00
Michael Niedermayer
622d24e4eb avformat/mov: simplify code setting needs_parsing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-27 13:52:55 +01:00
Michael Niedermayer
649686d89b avcodec/h264_refs: remove lost frames instead of disfavoring them 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-27 11:16:23 +01:00
Michael Niedermayer
33a2b45c2e Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  af_compand: add a dependency on strtok_r

Conflicts:
	configure

Not merged as FFmpegs compand filter does not depend on strtok_r
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-27 10:34:31 +01:00
Michael Niedermayer
64bb64f704 avcodec/h264: fix droped frame handling also for threads > 1 
Seems i mistakely tested just with threads=1
Fixes part of Ticket3386

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-27 08:07:46 +01:00
Michael Niedermayer
b5005def8a avcodec/h264: avoid using lost frames as references 
Fixes Ticket3386

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-27 03:26:03 +01:00
Marton Balint
ead0dd3cf6 lavfi/frei0r: factorize plugin loading with static path 
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2014-02-26 22:48:37 +01:00
Marton Balint
35ead1f281 lavfi/frei0r: search plugins in lib64 dirs on all architectures 
As Reimar Döffinger pointed out there are non-x86 64bit architectures as well.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2014-02-26 22:46:15 +01:00
Michael Niedermayer
c4c5351f08 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  build: Do not redundantly specifiy H.263-related object files for MSMPEG4v*

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 22:02:23 +01:00
Anton Khirnov
291e49d4e7 af_compand: add a dependency on strtok_r 2014-02-26 21:59:14 +01:00
Diego Biurrun
a63ac1106d build: Do not redundantly specifiy H.263-related object files for MSMPEG4v* 
These are already covered through dependencies specified in configure.
 2014-02-26 19:44:55 +01:00
Peter Ross
1524b0fa68 libavcodec/rawdec: avoid memcpy when performing 16-bit samples shift 
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 19:44:34 +01:00
Timothy Gu
baa650cc79 configure: use pkg-config to detect libbluray 
The current configure fails when static libbluray is compiled with libxml2
support.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 18:57:43 +01:00
Michael Niedermayer
bdadf05ec8 avcodec/parser: put lost comments back 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 18:57:43 +01:00
Paul B Mahol
9d297641ee avformat/sdr2: h264 stream needs parsing 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-02-26 17:46:45 +00:00
Paul B Mahol
9f2a3bcee7 avfilter: remove superflous lines 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-02-26 16:37:59 +00:00
Paul B Mahol
a2e4b4e968 avfilter/af_compand: some more cosmetics to decrease difference with qatar 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2014-02-26 15:03:09 +00:00
Michael Niedermayer
8f946ac8ea avfilter: remove af_compand_fork 
All relevant changes except the float/double one have been merged

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 13:21:29 +01:00
Michael Niedermayer
c62d83a5e7 avfilter/af_compand: more cosmetics from libavfilter/af_compand_fork.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 13:12:38 +01:00
Michael Niedermayer
05412f4cd4 avfilter/af_compand: cosmetics from libavfilter/af_compand_fork.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 13:00:09 +01:00
Michael Niedermayer
5e02ff3e3d avfilter/af_compand: switch defaults to libavfilter/af_compand_fork.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 13:00:09 +01:00
Michael Niedermayer
619d6b8f55 avfilter/af_compand: "use local variable for channels" from libavfilter/af_compand_fork.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 13:00:09 +01:00
Michael Niedermayer
e509df4bc8 avfilter/af_compand: error checks from libavfilter/af_compand_fork.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 13:00:09 +01:00
Michael Niedermayer
4b87975147 avfilter/af_compand: pts init code from libavfilter/af_compand_fork.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 12:46:04 +01:00
Michael Niedermayer
5c78fe08b0 avfilter/af_compand: cosmetics and doxy comment from libavfilter/af_compand_fork.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 12:42:47 +01:00
Michael Niedermayer
66ad3292eb avfilter/af_compand: add Andrew Kelley to the copyright 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 12:40:33 +01:00
Michael Niedermayer
86a191e25b avfilter/af_compand: merge avframe code from af_compand_fork 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 12:33:28 +01:00
Michael Niedermayer
27ba05adbc avfilter/af_compand: merge uninit() calls on error from af_compand_fork.c 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 12:11:33 +01:00
Michael Niedermayer
8b80485960 avfilter/af_compand: also support '|' as seperator 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 12:04:00 +01:00
Michael Niedermayer
1df1a1fe61 avfilter/af_compand_fork: avoid strtok_r() so as not to break build 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 11:48:34 +01:00
Michael Niedermayer
22307f170f avfilter/af_compand: whitespace changes from af_compand_fork 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 11:41:36 +01:00
Michael Niedermayer
5d166de258 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavfi: add compand audio filter

Conflicts:
	Changelog
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/af_compand.c
	libavfilter/allfilters.c
	libavfilter/version.h

The filter is added as new one so as to ease clean merging of its changes
in debug-able steps
See: 6b68e2a43b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-26 11:27:02 +01:00
Andrew Kelley
738f83582a lavfi: add compand audio filter 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-02-26 08:09:58 +01:00
Carl Eugen Hoyos
96fc2908f0 Read bits_per_coded_sample from V_MS/VFW/FOURCC mkv files. 
Fixes ticket #3425.
 2014-02-26 00:02:51 +01:00
Michael Niedermayer
2673357048 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  parser: cosmetics: Drop some unnecessary parentheses

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-25 20:52:45 +01:00
Michael Niedermayer
1f2bacc897 Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a' 
* commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a':
  libavfilter: example audio filtering program

Conflicts:
	.gitignore
	configure
	doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-25 20:26:00 +01:00
Andrew Kelley
9e329185d7 avfilter/af_compand: fix invalid read 
Fixes #3383.
 2014-02-25 19:00:14 +00:00
Michael Niedermayer
72d580f819 Merge commit 'a1c699659d56b76c0bf399307f642c6fd6d28281' 
* commit 'a1c699659d56b76c0bf399307f642c6fd6d28281':
  parser: K&R formatting cosmetics

Conflicts:
	libavcodec/parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-25 19:12:30 +01:00
Michael Niedermayer
0306436416 Merge commit 'ed61f3ca8a0664a697782253b354055136c5d303' 
* commit 'ed61f3ca8a0664a697782253b354055136c5d303':
  parser: Remove commented-out cruft

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-25 19:03:45 +01:00
Hendrik Leppkes
bc249bd673 mpegvideo: re-indent buffer clearing code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-25 13:47:16 +01:00
Hendrik Leppkes
fa84231ee8 mpegvideo: fix overwriting hwaccel surface objects 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-25 13:47:10 +01:00
Diego Biurrun
4ec336484d parser: cosmetics: Drop some unnecessary parentheses 2014-02-25 13:40:47 +01:00
Anton Khirnov
e7dfaf16a4 libavfilter: example audio filtering program 
Based on a patch by Andrew Kelley <superjoe30@gmail.com>

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-02-25 13:22:10 +01:00
Peter Ross
bef6b27f10 avcodec/vp8dsp: use AV_ZERO64 to clear idct coefficient rows 
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-25 12:49:35 +01:00
Luca Barbato
a1c699659d parser: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-02-25 12:28:33 +01:00
Diego Biurrun
ed61f3ca8a parser: Remove commented-out cruft 2014-02-25 11:59:05 +01:00