Chris Moeller
7387506b06
avformat: read id3v2 comment tags
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-07 04:23:24 +02:00
James Almer
d950279cbf
avcodec/ttadsp: cosmetics
...
Clean some header includes and use the same naming scheme as
in ttaencdsp
Signed-off-by: James Almer <jamrial@gmail.com>
2016-08-06 18:27:01 -03:00
Michael Niedermayer
803c058a6f
avformat/mov: Enable mp3 parsing if a packet needs it
...
Fixes Ticket5689
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-06 22:43:19 +02:00
James Almer
61da882cea
Merge commit '90944ee3ab79081845ea1bd97eea475031ce0842'
...
* commit '90944ee3ab79081845ea1bd97eea475031ce0842':
avconv: refactor selecting an encoder
Conflicts:
ffmpeg.c
ffmpeg_opt.c
Merged-by: James Almer <jamrial@gmail.com>
2016-08-06 13:31:12 -03:00
Burt P
2ce985c049
af_hdcd: convert AVOptions from INT to BOOL
...
As suggested by Timothy Gu.
Signed-off-by: Burt P <pburt0@gmail.com>
2016-08-06 11:16:58 -05:00
Michael Niedermayer
c1bfeda5a3
avcodec/ffv1enc: Fix assertion failure with non zero bits per sample
...
Fixes Ticket5736
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-06 02:22:15 +02:00
Carl Eugen Hoyos
82e53b3cef
lavc/vaapi_encode_h26x: Fix a crash if "." is not the decimal separator.
...
Fixes Debian bugs #831529 , #831909 , #832964 .
Signed-off-by: Mark Thompson <sw@jkqxz.net>
2016-08-05 21:24:54 +01:00
Matthias Hunstock
d8ee02a071
decklink: enhancement: format selection with AVRational v2
...
When finding a video mode based on frame size and frame rate,
use AVRational methods instead of simple comparison. Add debug information.
Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-05 21:33:43 +02:00
Matthias Hunstock
8431a6e654
decklink: fix: set fps on video stream v2
...
Provide the stream with the correct fps information when capturing.
Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-05 20:43:36 +02:00
Michael Niedermayer
be7150d497
avformat/teeproto: set forgotten url_close()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-05 18:59:21 +02:00
Andreas Cadhalpun
a16018461b
lavf: forward protocol_whitelist for the remaining cases
...
Also set a default_whitelist for mmsh and ffrtmphttp.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-05 16:18:49 +02:00
Paul B Mahol
04a8bbca92
avfilter/avf_showspectrum: add color rotation feature
...
Mostly useful with channel color scheme.
2016-08-05 12:18:56 +02:00
Shivraj Patil
6803a298f4
Support for MIPS cpu P6600
...
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-05 11:41:46 +02:00
Michael Niedermayer
1fb8f6b75c
avformat/img2enc: Use AV_FRAME_FILENAME_FLAGS_MULTIPLE, support tee:
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-04 23:22:54 +02:00
Michael Niedermayer
dd96a58473
avformat/hlsenc: Use AV_FRAME_FILENAME_FLAGS_MULTIPLE, support tee:
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-04 23:22:54 +02:00
Michael Niedermayer
82a33c8d85
avformat: Add av_get_frame_filename2() and AV_FRAME_FILENAME_FLAGS_MULTIPLE
...
This will be used to allow writing file sequences using the tee output onto
multiple places in parallel
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-04 23:22:54 +02:00
James Almer
be63ef3c4e
avcodec/vdpau: clean up vdpau_internal.h
...
Also don't include it on files that don't need it.
This reduces differences with libav
Tested-by: Timothy Gu <timothygu99@gmail.com>
Reveiwed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2016-08-04 16:40:51 -03:00
James Almer
376d4b3c0d
avformat: add a TTA Muxer
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2016-08-04 16:25:40 -03:00
James Almer
ce944e8489
avformat/tta: remove custom crc callback function
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2016-08-04 16:25:36 -03:00
James Almer
155f4e9630
avformat/avio: add a crc callback function for CRC-32 IEEE-LE
...
Reviewed-by: Nicolas George <george@nsup.org>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2016-08-04 16:25:32 -03:00
Timothy Gu
f297d1e9e5
h264dec: Fix indentation
2016-08-04 11:16:44 -07:00
Timothy Gu
26648703db
ffmpeg_opt: Remove duplicated initialization of attachment stream
...
These two fields are already initialized to the same values in
new_attachment_stream().
2016-08-03 21:29:38 -07:00
Timothy Gu
e5c79cd854
Merge commit '5e1840622ce6e41c57d9c407604863d3f3dcc3ae'
...
* commit '5e1840622ce6e41c57d9c407604863d3f3dcc3ae':
avconv: fix handling attachments in init_output_stream
Conflicts:
avconv.c
This is functionally a no-op, as we don't have the bug this is trying to
fix. See 843be56ee1
.
Merged-by: Timothy Gu <timothygu99@gmail.com>
2016-08-03 21:28:43 -07:00
Timothy Gu
1b04ea1a6c
Merge commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee' into merge
...
* commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee':
avconv: create simple filtergraphs earlier
Merged-by: Timothy Gu <timothygu99@gmail.com>
2016-08-03 20:53:03 -07:00
Timothy Gu
9aa3023672
Merge commit '49670e4218d34899a1c37abb7a11615efc16f757'
...
* commit '49670e4218d34899a1c37abb7a11615efc16f757':
avconv: add a function for determining whether a filtergraph is simple
Conflicts:
avconv.c
Merged-by: Timothy Gu <timothygu99@gmail.com>
2016-08-03 20:33:57 -07:00
Timothy Gu
7f7cedd713
Merge commit '58640fe89ec4f2a3d67c0a2585fca8de34440857'
...
* commit '58640fe89ec4f2a3d67c0a2585fca8de34440857':
h264: handle frame recovery in h264_field_start()
Conflicts:
libavcodec/h264dec.c
Merged-by: Timothy Gu <timothygu99@gmail.com>
2016-08-03 20:07:21 -07:00
Timothy Gu
de62531286
Merge commit 'e26c64148be8a20ace7512d96503172fb5e9753b'
...
* commit 'e26c64148be8a20ace7512d96503172fb5e9753b':
h264: discard slices of redundant pictures right after parsing the slice header
Conflicts:
libavcodec/h264_slice.c
libavcodec/h264dec.c
TODO: fix indentation
Merged-by: Timothy Gu <timothygu99@gmail.com>
2016-08-03 19:50:06 -07:00
Timothy Gu
e0c8250a59
Merge commit '6efc4638584e1e14d1a6152186ba28f5d48a80c0'
...
* commit '6efc4638584e1e14d1a6152186ba28f5d48a80c0':
h264: always set redundant_pic_count during slice header parsing
Merged-by: Timothy Gu <timothygu99@gmail.com>
2016-08-03 19:09:19 -07:00
Timothy Gu
d3426fb592
Merge commit '606fb6c032fa44d9fa1efd4971308c228f2ebfff'
...
* commit '606fb6c032fa44d9fa1efd4971308c228f2ebfff':
h264: call the hwaccel frame_start() from h264_field_start()
This commit is a noop, as it conflicts with 3e53211a57
.
Merged-by: Timothy Gu <timothygu99@gmail.com>
2016-08-03 17:47:06 -07:00
Timothy Gu
826c780c12
Revert "Revert "Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'""
...
This reverts commit e4af9be0f4
and redoes
796027f221
.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-03 17:45:52 -07:00
Timothy Gu
e4af9be0f4
Revert "Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'"
...
This reverts commit 796027f221
, reversing
changes made to bca30ed2b6
.
Preemptive revert before further testing has been done.
2016-08-03 17:06:55 -07:00
Timothy Gu
796027f221
Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'
...
* commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22':
h264: fix the check for mixed IDR/non-IDR slices
Conflicts:
libavcodec/h264_slice.c
libavcodec/h264dec.c
Merged-by: Timothy Gu <timothygu99@gmail.com>
2016-08-03 15:59:51 -07:00
Timothy Gu
bca30ed2b6
Merge commit 'b13fc1e344011949929975a3451f78f226aa1de3'
...
* commit 'b13fc1e344011949929975a3451f78f226aa1de3':
h264: do not pass H264Context to h264_slice_header_parse()
Conflicts:
libavcodec/h264dec.h
Did not merge the h264_slice_header_parse() part. We use a few other
members of H264Context for error checking in that function.
Merged-by: Timothy Gu <timothygu99@gmail.com>
2016-08-03 15:41:59 -07:00
Paul B Mahol
4be8ab70a6
avfilter/af_astats: extend bitdepth calculation
2016-08-03 20:32:43 +02:00
Michael Niedermayer
b1ce800372
avformat/teeproto: Support parsing protocol options
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-03 19:40:26 +02:00
Michael Niedermayer
c5cc3b08e5
avformat/oggdec: Fix integer overflow with invalid pts
...
If negative pts are possible for some codecs in ogg then the code needs to be
changed to use signed values.
Found-by: Thomas Guilbert <tguilbert@google.com>
Fixes: clusterfuzz_usan-2016-08-02
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-03 16:09:03 +02:00
Michael Niedermayer
6cd9a8b67a
ffplay: Fix invalid array index
...
Found-by: Thomas Guilbert <tguilbert@google.com>
Fixes: clusterfuzz_usan-2016-08-02
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-03 16:09:03 +02:00
Carl Eugen Hoyos
8916ad956a
doc/filters: Fix option ranges for the sab filter.
...
Fixes ticket #5751 .
2016-08-03 15:20:38 +02:00
Patrick Felt
e9659d1a0b
decklink: Remove unneeded spaces in initializers
2016-08-02 22:46:28 -07:00
Burt P
e0b8cba058
af_hdcd: add flags to AVOption defs
...
Signed-off-by: Burt P <pburt0@gmail.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2016-08-02 22:40:23 -07:00
Timothy Gu
fd242479c6
mediacodec: Return ENOSYS on unsupported platforms
2016-08-02 22:32:12 -07:00
Timothy Gu
4e2a8c4920
jni: Return ENOSYS on unsupported platforms
2016-08-02 22:32:12 -07:00
Timothy Gu
58c7bf789f
doxygen: Standardize root-level modules
2016-08-02 22:15:25 -07:00
Timothy Gu
a4d7a6d1dd
mathematics: Extend and edit Doxygen
2016-08-02 21:53:34 -07:00
Timothy Gu
952c4cf7d0
rational: Extend Doxygen
2016-08-02 21:52:40 -07:00
Timothy Gu
f29ffbc87d
avutil/hash: Add more detailed Doxygen documentation
2016-08-02 21:49:52 -07:00
James Almer
613c86299f
avcodec/h264dec: move ff_h264_ps_uninit prototype to h264_ps.h
...
It's the proper place since 8c7932884d
Signed-off-by: James Almer <jamrial@gmail.com>
2016-08-03 00:36:09 -03:00
Steven Robertson
e1be80aa11
libavcodec/dnxhd: Enable 12-bit DNxHR support.
...
10- and 12-bit DNxHR use the same DC coefficient decoding process and
VLC table, just with a different shift value. From SMPTE 2019-1:2016,
8.2.4 DC Coefficient Decoding:
"For 8-bit video sampling, the maximum value of η=11 and for
10-/12-bit video sampling, the maximum value of η=13."
A sample file will be uploaded to show that with this patch, things
decode correctly:
dnxhr_hqx_12bit_1080p_smpte_colorbars_davinci_resolve.mov
Signed-off-by: Steven Robertson <steven@strobe.cc>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-03 03:17:32 +02:00
Timothy Gu
708d9e9fba
Doxyfile: Set STRIP_FROM_INC_PATH to project root
...
Show proper #include's on struct pages.
Before:
#include <buffer.h>
After
#include <libavutil/buffer.h>
2016-08-02 15:53:53 -07:00
Timothy Gu
ec234ccea4
mem: Order function prototypes semantically
2016-08-02 15:17:31 -07:00