RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
74,336 Commits 36 Branches 392 Tags 307 MiB
Commit Graph

74336 Commits

Author SHA1 Message Date
Hendrik Leppkes b3e5d59537 Merge commit '979cb55103fa8e8274806e496901203742c686d1' 
* commit '979cb55103fa8e8274806e496901203742c686d1':
  hevc: Split the sei parsing in 3 functions

Conflicts:
	libavcodec/hevc_sei.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-02 12:29:30 +02:00
Hendrik Leppkes 90ec89a629 Merge commit '043f46f5741e1a5caedf55d788e1a72aae3b7605' 
* commit '043f46f5741e1a5caedf55d788e1a72aae3b7605':
  hevc: Use switch instead of if-nests in decode_nal_sei_message

Conflicts:
	libavcodec/hevc_sei.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-02 12:25:41 +02:00
Hendrik Leppkes 2e290d6114 Merge commit '2cd841c0776535be56e4db67485fdd9509c9b9f4' 
* commit '2cd841c0776535be56e4db67485fdd9509c9b9f4':
  hevc: Use a proper enum for the SEI values

Conflicts:
	libavcodec/hevc_sei.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-02 12:18:40 +02:00
Michael Niedermayer 582d98aed9 tests/fate/mp3: Fix fate-mp3-float-extra_overread on mips-qemu 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-02 11:26:58 +02:00
Hendrik Leppkes db395bef7f Merge commit '80ea66112817c719b476de8f7d8d3b325f4c7dd1' 
* commit '80ea66112817c719b476de8f7d8d3b325f4c7dd1':
  avcodec: h264: Extract decoder methods

Conflicts:
	libavcodec/h264_sei.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-02 10:59:06 +02:00
Hendrik Leppkes 2ab827389b Merge commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672' 
* commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672':
  asfdec: remove improper assignement that caused wrong timestamps

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-02 10:41:56 +02:00
Hendrik Leppkes 07094e5e40 Merge commit '78491fe8cfed83d2aead95dafe26f0d3f999e961' 
* commit '78491fe8cfed83d2aead95dafe26f0d3f999e961':
  asfdec: do not export empty metadata

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-02 10:41:45 +02:00
Hendrik Leppkes d95fee4425 Merge commit '3e853ff7acc56b180950ab39e7282f1b938c8784' 
* commit '3e853ff7acc56b180950ab39e7282f1b938c8784':
  des: extend av_des_init() doxy

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-02 10:41:26 +02:00
Hendrik Leppkes 3cf08e96fc Merge commit 'd9e8b47e3144262d6bc4681740411d4bdafad6ac' 
* commit 'd9e8b47e3144262d6bc4681740411d4bdafad6ac':
  des: add av_des_alloc()

Conflicts:
	libavutil/des.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-02 10:41:16 +02:00
Hendrik Leppkes 9ca19971bc Merge commit '5d8bea3bb2357bb304f8f771a4107039037c5549' 
* commit '5d8bea3bb2357bb304f8f771a4107039037c5549':
  xtea: add av_xtea_alloc()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-02 10:39:37 +02:00
Hendrik Leppkes 52566efd5c Merge commit 'b469832de993dabbfe037bef59c68e90e82ebca5' 
* commit 'b469832de993dabbfe037bef59c68e90e82ebca5':
  rc4: extend av_rc4_init() doxy

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-02 10:38:53 +02:00
Hendrik Leppkes a130ec9540 Merge commit 'ae365453c370c85f278bff7fbf9e20d9d335cb2a' 
* commit 'ae365453c370c85f278bff7fbf9e20d9d335cb2a':
  rc4: add av_rc4_alloc()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-02 10:38:33 +02:00
Hendrik Leppkes 9ed59f16e0 Merge commit '7a7df34c91e16ea8936f59524145a2cdd6b790f9' 
* commit '7a7df34c91e16ea8936f59524145a2cdd6b790f9':
  blowfish: add av_blowfish_alloc()

Conflicts:
	doc/APIchanges
	libavutil/version.h

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-02 10:38:12 +02:00
Hendrik Leppkes 988ddfea5e Merge commit 'cd4d9df22738e6f147521ccb72c7930db6050914' 
* commit 'cd4d9df22738e6f147521ccb72c7930db6050914':
  asfdec: free AVDictionaries properly when closing the demuxer

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-02 10:34:18 +02:00
Hendrik Leppkes cf1ccfffa4 Merge commit '90e648c508fa6b97587ce62699a1449123f7d285' 
* commit '90e648c508fa6b97587ce62699a1449123f7d285':
  fate/mp3: use the f32le format as output

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-08-02 10:32:38 +02:00
Anton Khirnov 14e5580246 opusdec: properly handle mismatching configurations in multichannel streams 
The substreams can have different resampling delays, so an additional
level of buffering is needed to synchronize them.

Bug-Id: 876
 2015-08-02 08:43:51 +02:00
Alexandra Hájková fdbc544d29 asfdec: prevent the memory leak while reading metadata 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-08-02 08:43:51 +02:00
Henrik Gramner ebaf571aca x86: dct: Disable dct32_float_sse on x86-64 
There is an SSE2 implementation so the SSE version is never used. The "SSE"
version also happens to contain SSE2 instructions on x86-64.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-08-02 08:41:45 +02:00
Michael Niedermayer f080a01fd3 avcodec/hevc_mp4toannexb_bsf: Remove ;; 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-02 03:52:37 +02:00
Vesselin Bontchev 336822edf4 avformat/mov: fix regression in processing .aax files 
Commit 0a551cbe introduced "activation_bytes" option, and not specifying
this option (while calling ffmpeg / ffprobe) causes the program to quit
early. Before this commit, ffprobe was capable of processing metadata in
.aax files.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-02 03:40:38 +02:00
Paul B Mahol 5bf8590d6e avfilter/avf_showvolume: stop making output fully transparent 2015-08-01 19:40:34 +02:00
Rostislav Pehlivanov ec2090d21f aacenc: add description to the 'aac_coder' option 
This commit adds a short description to the aac_coder option of the
AAC encoder in order to be consistent with the other options.
Generally, right now, the 'FAAC' method works fine with speech and
low broadband spectrum audio. 'Fast' is just as the name suggests.
'ANMR' still needs work and 'Twoloop', the default, works well with
every type of audio.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2015-08-01 17:40:30 +01:00
Luca Barbato 979cb55103 hevc: Split the sei parsing in 3 functions 2015-08-01 15:45:50 +02:00
Luca Barbato 043f46f574 hevc: Use switch instead of if-nests in decode_nal_sei_message 
Makes simpler to add support for more SEI types.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-08-01 15:34:45 +02:00
Luca Barbato 2cd841c077 hevc: Use a proper enum for the SEI values 
And use the correct value for decoded_picture_hash.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-08-01 15:23:05 +02:00
David Holm 80ea661128 avcodec: h264: Extract decoder methods 
Extract two methods from decode_registered_user_data in order to improve
code readability. Also make the constant holding the allocation size a
64-bit unsigned integer so that the size comparison against INT_MAX makes
sense.

Bug-Id: CID1312090

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-08-01 14:29:53 +02:00
Michael Niedermayer b27d4fd997 Revert "libavcodec/utils: av_get_exact_bits_per_sample fixed to return "1" for DSD codecs." 
Requested-by: Ganesh Ajjanagadde <gajjanag@mit.edu> (original patch reviewer)
This reverts commit 293e25be61.
 2015-08-01 03:25:04 +02:00
Michael Niedermayer 55ea31ab89 Merge branch 'simple_http_server_api_implementation' of http://git.klaxa.eu/git/ffmpeg 
Reviewed-by: Nicolas George <george@nsup.org>
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-01 03:08:04 +02:00
Rostislav Pehlivanov 6d175158e9 aacenc: remove redundant argument from coder functions 
This commit removes a redundant argument from the functions in aaccoder.
The argument lambda was redundant as it was just a copy of s->lambda,
to which all functions have access to anyway. This cleans up the function
pointers a bit which is helpful as there are a lot of other search_for_*
functions under development and with them populated it gets messy.

Reviewed-by: Claudio Freire <klaussfreire@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-01 02:54:35 +02:00
Yu Xiaolei 2ef6994ef6 avcodec/libx264: expose nv21 input support 
libx264 added support for NV21 input recently.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-01 02:14:18 +02:00
Ihar A. Tumashyk 293e25be61 libavcodec/utils: av_get_exact_bits_per_sample fixed to return "1" for DSD codecs. 
All DSD codes have 1 bit per sample.
https://en.wikipedia.org/wiki/Direct_Stream_Digital

Signed-off-by: Ihar A. Tumashyk <itumashyk@gmail.com>
Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-08-01 01:49:21 +02:00
Stephan Holljes 25410c524d doc/example: Add http multi-client example code 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-08-01 00:58:32 +02:00
Stephan Holljes 1d46e0ee05 doc/protocols: document experimental mutli-client api 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-08-01 00:58:31 +02:00
Stephan Holljes 3240e69de6 lavf/http: Implement server side network code. 
add http_accept,
add http_handshake and move handshake logic there,
handle connection closing.

Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-08-01 00:58:31 +02:00
Stephan Holljes 75235a2550 lavf/tcp: increase range for listen and call the underlying socket operations accordingly 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-08-01 00:58:31 +02:00
Stephan Holljes 21198155a7 lavf/tcp: add tcp_accept 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-08-01 00:58:31 +02:00
Stephan Holljes 63c07a956b lavf/avio: add avio_accept and avio_handshake 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-08-01 00:58:31 +02:00
Stephan Holljes 5125e4b53f lavf/avio: add ffurl_accept and ffurl_handshake 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-08-01 00:58:31 +02:00
Stephan Holljes cf6c871bee lavf/network: split ff_listen_bind into ff_listen and ff_accept 
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
 2015-08-01 00:58:31 +02:00
Paul B Mahol 5870b3d2a3 MAINTAINERS: update my maintership 2015-07-31 20:25:07 +02:00
rogerdpack bed1d9ec7a dshow: show more debug timestamp info 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
 2015-07-31 18:30:03 +02:00
Michael Niedermayer f2c58931e6 MAINTAINERS: Remove myself as leader 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-31 15:55:20 +02:00
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