virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Code Issues Releases Activity
69,317 Commits 37 Branches 400 Tags 467 MiB
6e57d2da90
Commit Graph

69317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
6e57d2da90 Merge commit '9404a47a2d1df418946a338938eb6cdb3afed474' 
* commit '9404a47a2d1df418946a338938eb6cdb3afed474':
  h264: move parser-only variables to their own context

Conflicts:
	libavcodec/h264_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 15:08:17 +01:00
Michael Niedermayer
3d04117078 Merge commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094' 
* commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094':
  error_resilience: move the MECmpContext initialization into ER code

Conflicts:
	libavcodec/error_resilience.c
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 14:56:52 +01:00
Michael Niedermayer
a1cdd1f08e Merge commit 'a7e0380497306d9723dec8440a4c52e8bf0263cf' 
* commit 'a7e0380497306d9723dec8440a4c52e8bf0263cf':
  avconv_dxva2: add hevc support

See: 5f2cdf9c3c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 14:46:02 +01:00
Michael Niedermayer
b6938c94d6 Merge commit '7e850fa67e32ebe98581c2e4ca4a4655dee7f116' 
* commit '7e850fa67e32ebe98581c2e4ca4a4655dee7f116':
  Add DXVA2 HEVC HWAccel

Conflicts:
	configure
	libavcodec/allcodecs.c
	libavcodec/dxva2_hevc.c

See: 36962ad233
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 14:25:02 +01:00
Michael Niedermayer
2d4b8af4f6 Merge commit 'b82722df9b2911bd41e0928db4804067b39e6528' 
* commit 'b82722df9b2911bd41e0928db4804067b39e6528':
  hevc: reindent after previous commit

Conflicts:
	libavcodec/hevc.c

See: f8ecffa9b7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 14:22:35 +01:00
Michael Niedermayer
4e40e61287 Merge commit 'e72e8c5a1df61447ac7af750531e96e8b62d02ba' 
* commit 'e72e8c5a1df61447ac7af750531e96e8b62d02ba':
  hevc: add hwaccel hooks

Conflicts:
	libavcodec/hevc.c
	libavcodec/hevc_refs.c

See: b2e9b0f5d4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 14:13:18 +01:00
Michael Niedermayer
2b5fa0e0be Merge commit '4b95e95dbae58c9b60891284bf8b5bbd83e5293a' 
* commit '4b95e95dbae58c9b60891284bf8b5bbd83e5293a':
  hevc: store the short term rps flag and size in the context

See: 06894f1a04
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 14:03:26 +01:00
Michael Niedermayer
f35c4f4a17 Merge commit '36779a84051eae6744cc936d91b1d428143665ba' 
* commit '36779a84051eae6744cc936d91b1d428143665ba':
  hevc: store the escaped/raw bitstream in HEVCNAL

See: 2af82a1ad9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 13:56:11 +01:00
Michael Niedermayer
183bffb3a3 Merge commit 'b0593a4bca138f1f026d8c21e8c3daa96800afe2' 
* commit 'b0593a4bca138f1f026d8c21e8c3daa96800afe2':
  hevc: pass the full HEVCNAL struct to decode_nal_unit

Conflicts:
	libavcodec/hevc.c

See: 77140279d3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 13:55:15 +01:00
Michael Niedermayer
e5c28d4f9a Merge commit '3a70c0c95feacb3844d05eebd579fc8189a77eee' 
* commit '3a70c0c95feacb3844d05eebd579fc8189a77eee':
  examples/transcode_aac: generate proper PTS and set the muxer timebase

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 13:35:31 +01:00
Michael Niedermayer
d078d57fb7 Merge commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e' 
* commit 'c9b19ac8928c6c9b7f25c3988177204f110d5e0e':
  examples/transcode_aac: fix a typo

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 13:29:46 +01:00
Michael Niedermayer
010311d673 Merge commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761' 
* commit '749a89d1b8bb73b4d4f14c48f33259a1300c1761':
  examples/transcode_aac: properly select the output sample format

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 13:21:02 +01:00
Michael Niedermayer
a7fa1b9aa1 Merge commit '443b71928b2f36362e805c037751e6c3c79ea4e8' 
* commit '443b71928b2f36362e805c037751e6c3c79ea4e8':
  hevc: unref the current frame if frame_start() fails

Conflicts:
	libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 13:15:06 +01:00
Michael Niedermayer
74e5a5a849 Merge commit '1dd021929f8157b88529ce1e6ab6351dd2899e89' 
* commit '1dd021929f8157b88529ce1e6ab6351dd2899e89':
  hevc: clear unused refs on failure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 13:02:36 +01:00
Michael Niedermayer
ed8de1570d Merge commit 'f9f883af4fe615a832407a657752e248a96c6280' 
* commit 'f9f883af4fe615a832407a657752e248a96c6280':
  h264: simplify code in flush_dpb()

Conflicts:
	libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 12:55:21 +01:00
Hendrik Leppkes
5f2cdf9c3c ffmpeg_dxva2: add hevc support 
Reviewed-by: compn <tempn@mi.rr.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 12:37:34 +01:00
Hendrik Leppkes
36962ad233 Add DXVA2 HEVC HWAccel 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 12:37:34 +01:00
Hendrik Leppkes
f8ecffa9b7 hevc: reindent after previous commit 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 12:37:34 +01:00
Hendrik Leppkes
b2e9b0f5d4 hevc: add hwaccel hooks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 12:37:34 +01:00
Hendrik Leppkes
06894f1a04 hevc: store the short term rps flag and size in the context 
For future use by hardware accelerators.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 12:37:34 +01:00
Hendrik Leppkes
2af82a1ad9 hevc: store the escaped/raw bitstream in HEVCNAL 
Hardware Accelerators require access to the escaped bitstream.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 12:37:34 +01:00
Stefano Sabatini
afa3c996fe lavfi/lut: apply minor compute_gammaval709() doxy fix 2015-01-27 11:22:45 +01:00
Anton Khirnov
9404a47a2d h264: move parser-only variables to their own context 2015-01-27 09:08:31 +01:00
Anton Khirnov
cf1e0786ed error_resilience: move the MECmpContext initialization into ER code 
Currently, it needs to be initialized by the ER caller (which is
currently either a mpegvideo decoder or h264dec). However, since none of
those decoders use MECmpContext for anything except ER, it makes more
sense to handle it purely inside ER.
 2015-01-27 09:07:59 +01:00
Hendrik Leppkes
a7e0380497 avconv_dxva2: add hevc support 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-01-27 09:06:05 +01:00
Hendrik Leppkes
7e850fa67e Add DXVA2 HEVC HWAccel 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-01-27 09:05:31 +01:00
Hendrik Leppkes
b82722df9b hevc: reindent after previous commit 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-01-27 09:05:25 +01:00
Hendrik Leppkes
e72e8c5a1d hevc: add hwaccel hooks 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-01-27 09:05:08 +01:00
Hendrik Leppkes
4b95e95dba hevc: store the short term rps flag and size in the context 
For future use by hardware accelerators.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-01-27 09:04:59 +01:00
Hendrik Leppkes
36779a8405 hevc: store the escaped/raw bitstream in HEVCNAL 
Hardware Accelerators require access to the escaped bitstream.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-01-27 09:04:44 +01:00
Hendrik Leppkes
b0593a4bca hevc: pass the full HEVCNAL struct to decode_nal_unit 
This enables decode_nal_unit to access additional fields added in
subsequent commits.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-01-27 09:04:29 +01:00
Andreas Unterweger
3a70c0c95f examples/transcode_aac: generate proper PTS and set the muxer timebase 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-01-27 09:03:08 +01:00
Andreas Unterweger
c9b19ac892 examples/transcode_aac: fix a typo 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-01-27 09:00:23 +01:00
Andreas Unterweger
749a89d1b8 examples/transcode_aac: properly select the output sample format 
Makes the example work with all the supported AAC encoders.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-01-27 08:58:47 +01:00
Anton Khirnov
443b71928b hevc: unref the current frame if frame_start() fails 
Prevents DPB from filling up with damaged input.
 2015-01-27 08:34:56 +01:00
Anton Khirnov
1dd021929f hevc: clear unused refs on failure 2015-01-27 08:34:46 +01:00
Anton Khirnov
f9f883af4f h264: simplify code in flush_dpb() 
There is no point in clearing reference explicitly, since that will be
done as a part of ff_h264_unref_picture() right below.
 2015-01-27 08:34:24 +01:00
Michael Niedermayer
aa508a9c5f fate: Fix bitexactness for vsynth3-dnxhd-1080i-colr 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 03:45:14 +01:00
Michael Niedermayer
f5b3257c50 avfilter/vf_eq: mark src as const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 01:46:08 +01:00
Andreas Cadhalpun
f8716d1e56 configure: use ar and ranlib in deterministic mode if available 
this makes the static libraries binary reproducible

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 01:15:09 +01:00
Michael Niedermayer
530bf8ece6 avfilter/vf_eq: Fix clipping code 
Found-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-26 23:46:44 +01:00
Michael Niedermayer
5a1e524ba7 Revert "configure: use ar and ranlib in deterministic mode" 
This breaks on BSDs

This reverts commit 7e857cd571.
 2015-01-26 23:02:01 +01:00
Andreas Cadhalpun
7e857cd571 configure: use ar and ranlib in deterministic mode 
this makes the static libraries binary reproducible

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-26 19:56:40 +01:00
Kevin Wheatley
7b6f419176 avformat/movenc: Add simplistic 'colr' tag writing support to mov container 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-26 17:49:50 +01:00
James Almer
b8f3b0703c tools/crypto_bench: add Camellia support 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-01-26 13:37:57 -03:00
Timo Rothenpieler
914fd42b8a avcodec/nvenc: Fix b-frame parameter handling 
This should behave similar to x264 and other encoders, as it handles a
gop_size of 0 as Intra-Only, while it's still possible to control how
many B-Frames it inserts.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-26 15:39:01 +01:00
Michael Niedermayer
fcb18ab8d0 Merge remote-tracking branch 'rdp/dshow_tv_tuner' 
* rdp/dshow_tv_tuner:
  dshow: tweak logging
  dshow: crossbar dialog was frequently being displayed twice, split up option so it can be just once
  dshow: alert as to ramifications of switching crossbar routing
  dshow: add properties dialog for tv tuners

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-26 14:39:25 +01:00
Paul B Mahol
e44a4c1f5f avfitler/vf_fieldmatch: fix typo 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-26 13:04:53 +00:00
Paul B Mahol
5a919ced0d avfilter/libmpcodecs: remove unused headers 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-01-26 12:14:16 +00:00
Carl Eugen Hoyos
fe47cba7e8 Decode Prores 4444 XQ with the existing Prores decoder. 
The frames are said to contain a higher bit-depth but
users report that our decoder shows visually correct output.
Requested by forum user gregba and Christoph Gerstbauer.
 2015-01-26 12:05:14 +01:00