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
74,244 Commits 37 Branches 400 Tags 465 MiB
49a14a7616
Commit Graph

74244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
814d4c4c94 Merge commit 'a0797950527120c85263c910eb6ba08fddcfdcb3' 
* commit 'a0797950527120c85263c910eb6ba08fddcfdcb3':
  fate/mp3: specify the number of output samples instead of filesize

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-31 11:56:42 +02:00
Alexandra Hájková
33dc1913ab asfdec: remove improper assignement that caused wrong timestamps 
and remove unneeded variable

Sample-Id: https://samples.libav.org/asf-wmv/asf-code-53/movn018.asf

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-31 09:10:05 +02:00
Alexandra Hájková
78491fe8cf asfdec: do not export empty metadata 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-31 09:09:27 +02:00
James Almer
3e853ff7ac des: extend av_des_init() doxy 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-31 09:04:12 +02:00
James Almer
d9e8b47e31 des: add av_des_alloc() 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-31 09:04:12 +02:00
James Almer
5d8bea3bb2 xtea: add av_xtea_alloc() 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-31 09:04:12 +02:00
James Almer
b469832de9 rc4: extend av_rc4_init() doxy 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-31 09:04:12 +02:00
James Almer
ae365453c3 rc4: add av_rc4_alloc() 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-31 09:04:12 +02:00
James Almer
7a7df34c91 blowfish: add av_blowfish_alloc() 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-31 09:04:09 +02:00
Alexandra Hájková
cd4d9df227 asfdec: free AVDictionaries properly when closing the demuxer 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-31 07:23:20 +02:00
Anton Khirnov
90e648c508 fate/mp3: use the f32le format as output 
Those tests test the float decoder, so it is preferable to dump the
decoder output directly instead of converting it to s16.
 2015-07-31 07:11:35 +02:00
Anton Khirnov
a079795052 fate/mp3: specify the number of output samples instead of filesize 
This is not dependent on the output format.
 2015-07-31 07:11:34 +02:00
Ganesh Ajjanagadde
c1bfb99ff2 avformat/wavdec: add extra sample count check for G.729 files 
Can be used to fix Ticket4577

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-31 03:17:55 +02:00
James Almer
a0092cea46 mips/hevcdsp: fix string concatenation on macros 
Needed for old compilers like GCC 4.2

Tested by trac user brad. Fixes ticket #4745

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-07-30 20:44:32 -03:00
James Almer
9dcaae70f2 x86/aacpsdsp: add SSE and SSE3 optimized functions 
Between 1.5 and 2.5 times faster

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-07-30 19:01:15 -03:00
Michael Niedermayer
d2077c860e Revert "ffmpeg: modify tty state when stderr is redirected" 
faults in fate otherwise breaks the terminal.
To reproduce, add a abort() into wav_read_header()
run make fate-acodec-adpcm-ima_wav

This reverts commit 92e62f49cf.
 2015-07-30 23:49:54 +02:00
Michael Niedermayer
802e51299e avcodec/r210enc: Drop coded_frame usage 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 19:57:58 +02:00
Michael Niedermayer
dfe8e3b381 avcodec/avuienc: Drop coded_frame usage 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 19:57:07 +02:00
Michael Niedermayer
bc4bdc6d61 Merge commit '764ec70149728be82304c163ccc4e280f1629201' 
* commit '764ec70149728be82304c163ccc4e280f1629201':
  rtsp: Only interpret $ as interleaved packet indicator at the start of replies

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 18:37:37 +02:00
Michael Niedermayer
d560c61125 Merge commit '6877537ff321136cf78ab03b8b91e6b6f218db5b' 
* commit '6877537ff321136cf78ab03b8b91e6b6f218db5b':
  hmac: add missing version bump and APIChanges entry

Conflicts:
	libavutil/version.h

version.h is not changed as the code has been added 2 years ago in FFmpeg

See: 82ef67016e
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 18:37:05 +02:00
Michael Niedermayer
ba12ba859a Merge commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744' 
* commit '0c73a5a53cc97f4291bbe9e1e68226edf6161744':
  hls: Save and forward avio options

Conflicts:
	libavformat/hls.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 17:52:23 +02:00
Michael Niedermayer
8e67599505 Merge commit '5ae178539b91d25710b7bb322d156c31aea9f8bf' 
* commit '5ae178539b91d25710b7bb322d156c31aea9f8bf':
  http: Add the trailing endlines if they are missing

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 16:24:03 +02:00
Michael Niedermayer
77d8fd5c9c avcodec/y41penc: Drop coded_frame usage 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 16:14:23 +02:00
Michael Niedermayer
9ebffc5bba avcodec/yuv4enc: drop coded_frame usage 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 16:14:06 +02:00
Martin Storsjö
764ec70149 rtsp: Only interpret $ as interleaved packet indicator at the start of replies 
Allow $ as character anywhere within normal RTSP replies - both
within the lines, and as the first character of RTSP header lines.
(The existing old comment indicated that an inline packet could
start at any line within a RTSP reply header, but that doesn't
sound valid to me, and I'm not sure if the existing code
handled that correctly either.)

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-07-30 16:59:36 +03:00
Michael Niedermayer
a0123b6023 avcodec/v308enc: Remove coded_frame usage 
coded_frame is deprecated

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 15:54:45 +02:00
Michael Niedermayer
2d80de0be2 avcodec/v408enc: remove coded_frame usage 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 15:53:54 +02:00
James Almer
6877537ff3 hmac: add missing version bump and APIChanges entry 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-07-30 16:40:26 +03:00
Ganesh Ajjanagadde
92e62f49cf ffmpeg: modify tty state when stderr is redirected 
This fixes Ticket2964

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 14:31:26 +02:00
Michael Niedermayer
1919827f2c Merge commit 'bf0cef5c3a114df452e5476167634dd8f51eb448' 
* commit 'bf0cef5c3a114df452e5476167634dd8f51eb448':
  checkasm: Include io.h for isatty, if available

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 12:23:54 +02:00
Michael Niedermayer
dd0dbaccb7 Merge commit '9487ffd4c02b9e261562d43735490068c0df0d4b' 
* commit '9487ffd4c02b9e261562d43735490068c0df0d4b':
  rtmpproto: free hmac context properly

See: 6ce3d9fc4a
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 12:14:54 +02:00
Luca Barbato
0c73a5a53c hls: Save and forward avio options 
Make possible to send the custom headers and override the user agent.

Reported-by: BenWonder
 2015-07-30 11:21:26 +02:00
Luca Barbato
5ae178539b http: Add the trailing endlines if they are missing 
Makes slightly easier the life of those want to use the option
from the command line
 2015-07-30 11:21:26 +02:00
Martin Storsjö
bf0cef5c3a checkasm: Include io.h for isatty, if available 
configure does check for isatty, and checkasm properly checks
HAVE_ISATTY, but on some platforms (e.g. WinRT), io.h needs to be
included for isatty to be available.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-07-30 09:27:09 +03:00
James Almer
9487ffd4c0 rtmpproto: free hmac context properly 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-07-30 09:26:49 +03:00
Michael Niedermayer
f977e69dac avcodec/mpegvideo_enc: Ignore QMAX if VBV constraints are exceeded 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 05:00:54 +02:00
Michael Niedermayer
bf2474c74f avcodec/mpeg12enc: extend QP range to 28 for non linear quantizers 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 05:00:54 +02:00
James Zern
9723d439fd libvpxenc: report pict_type/error via side-data 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Zern <jzern@google.com>
 2015-07-29 19:59:20 -07:00
James Zern
88df16fe6d libvpxenc: quiet coded_frame deprecation warnings 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Zern <jzern@google.com>
 2015-07-29 19:59:19 -07:00
James Almer
6ce3d9fc4a avformat/rtmpproto: free hmac context properly 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-07-29 23:56:22 -03:00
James Almer
222d7619ce avfilter/vf_pnsr: fix author name 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-07-29 22:28:09 -03:00
Michael Niedermayer
363995296f doc/APIchanges: fill in some missing things 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 03:09:04 +02:00
James Almer
bc397246aa avutil/hmac: fix API/ABI compatibility with the fork 
The test code is updated with some cosmetics to avoid the loop
using undefined AVHMACType values.
The old enum values will be removed in the next major bump, effectively
making both projects synced and without API or ABI issues.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-07-29 21:32:05 -03:00
Michael Niedermayer
15a7a3cf0a Merge commit '65dd6a1f84cc5c9a91d279e8e8b72ff7adf58d31' 
* commit '65dd6a1f84cc5c9a91d279e8e8b72ff7adf58d31':
  rtmpproto: use AVHMAC instead of a custom implementation

See: 6c87b86628
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 01:36:28 +02:00
Michael Niedermayer
277a5005b7 Merge commit 'e59f7cd89e7f4f096f8456d63191adec2f8b1083' 
* commit 'e59f7cd89e7f4f096f8456d63191adec2f8b1083':
  fate: add test vectors for HMAC SHA and SHA-2

Conflicts:
	libavutil/hmac.c
	tests/ref/fate/hmac

See: 1163910a00
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 01:28:00 +02:00
Michael Niedermayer
8c5cc7b7fb avutil/hmac: support another ABI difference to the fork 
spotted this and so adding it.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 01:25:05 +02:00
Michael Niedermayer
865564c466 Merge commit '7e38340b831af8e3271f22bd66b9da14953c02af' 
* commit '7e38340b831af8e3271f22bd66b9da14953c02af':
  hmac: add support for SHA-2

Conflicts:
	libavutil/hmac.c
	libavutil/hmac.h

See: 82ef67016e
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 00:24:41 +02:00
wm4
4c6beaed92 rawdec: fix mjpeg probing buffer size check 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-30 00:06:15 +02:00
wm4
bf51fcd304 rawdec: fix mjpeg probing 
There can be other headers than "Content-Type:" (in this case, a
"Content-Length:" header was following), so checking for a trailing
newline is wrong.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-29 23:50:46 +02:00
Michael Niedermayer
f8b81a02c9 avformat/oggdec: ogg_read_seek: reset ogg after seeking 
Fixes Ticket4743

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-29 23:22:12 +02:00