79dd756e14
rtmpproto: Fix a typo
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-15 21:00:39 +03:00
ced7238cd0
rtpdec_hevc: Use av_realloc instead of av_malloc+memcpy
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-15 20:54:32 +03:00
752e71e74f
rtpdec_hevc: Rename a variable for clarity
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-15 20:54:30 +03:00
8a95379990
doc/encoders: add basic libx265 documentation
...
Fixes ticket #3944 .
Signed-off-by: Lou Logan <lou@lrcd.com>
2014-10-15 09:45:54 -08:00
52b0a0ecaa
avcodec/ass: add FFmpeg signature
2014-10-15 19:25:06 +02:00
d281a87ae3
avformat/assdec: typo fix
2014-10-15 19:25:06 +02:00
462f2876ce
avcodec/ass_split: realign after addition of new fields
2014-10-15 19:25:06 +02:00
3e86ead383
avcodec/ass_split: assume default order when "Format:" line is not found
...
Fixes the decoding of the ASS stream in a mkv from a fansub release from
Coalgirls.
2014-10-15 19:25:06 +02:00
d9f272fe33
avcodec/ass_split: extend recognized fields in ASS splitter
...
This simplifies the logic for the fix in the next commit.
2014-10-15 19:25:06 +02:00
40b9f28641
avcodec/ass: output missing fields in AVSubtitles and output files
...
Fixes Ticket #3207
2014-10-15 19:25:06 +02:00
bf700a995d
avformat/assenc: support remuxing old V4 ASS form (SSA)
2014-10-15 19:24:40 +02:00
b243393e8b
fate: fix some subtitles tests dependencies
2014-10-15 19:24:39 +02:00
d97d4795fd
fate: add rawdiff and use it for subtitles
...
We want subtitles tests to match exactly line endings and trailing
characters.
2014-10-15 19:24:39 +02:00
8022bb1d92
fate: make subtitles tests output to stdout instead of md5
...
This makes tracking subtitles changes simpler.
2014-10-15 19:24:39 +02:00
b629b421d7
doc/filters: update link to OpenCV docs
...
Signed-off-by: Lou Logan <lou@lrcd.com>
2014-10-15 09:18:54 -08:00
a9ed4f1d15
Merge commit 'e5cfc8fdad901c9487fe896421972852f38bcf5'
...
* commit 'e5cfc8fdad901c9487fe896421972852f38bcf5':
sdp: Provide out of bound parameter sets for HEVC if extradata is set
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 19:16:55 +02:00
6afc319eee
Merge commit '9b7f932ee568cadfc0f556a061fcc00cb63f9780'
...
* commit '9b7f932ee568cadfc0f556a061fcc00cb63f9780':
rtpdec_hevc: Parse out of band vps/sps/pps/sei from fmtp lines
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 19:04:22 +02:00
137f7a630b
Merge commit '557d4c4ecae080729e68df54ed2bd8420d0f037a'
...
* commit '557d4c4ecae080729e68df54ed2bd8420d0f037a':
avconv: replace AVCodecContext.time_base with framerate
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 18:56:44 +02:00
a92192d2e4
avformat/utils: use av_reduce() to simplify code and avoid overflow in ff_compute_frame_duration()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 18:23:21 +02:00
2b37864e7f
Merge commit '2d6e58497e76836604364b037df9b00ba3d75b69'
...
* commit '2d6e58497e76836604364b037df9b00ba3d75b69':
lavf: switch to AVCodecContext.framerate for demuxing
Conflicts:
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 18:19:58 +02:00
18255441dd
avcodec/dpx: fix framerate
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 16:08:36 +02:00
220a15c074
avcodec/vc1: fix time_base and framerate
...
They are not just inverses of each other.
This should restore behavior to before the introduction of framerate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 16:08:36 +02:00
09450c5509
avcodec/h264: fix time_base and framerate
...
They are not just inverses of each other.
This should restore behavior to before the introduction of framerate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 16:08:36 +02:00
620e7f0f3b
avcodec/mpeg12dec: fix time_base and framerate
...
They are not just inverses of each other.
This should restore behavior to before the introduction of framerate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 15:54:02 +02:00
801876fb07
avcodec/utils: fix time_base after the framerate addition
...
time_base != 1/framerate for example for interlaced video
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 15:52:35 +02:00
17085a0251
Merge commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41'
...
* commit '7ea1b3472a61de4aa4d41b571e99418e4997ad41':
lavc: deprecate the use of AVCodecContext.time_base for decoding
Conflicts:
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/mpegvideo_parser.c
libavcodec/utils.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 15:49:31 +02:00
74b0237798
mov: Correctly check the color transfer characteristics range
...
Reported-by: Ruoyu <liangry@ucweb.com>
2014-10-15 14:48:40 +01:00
1ac5a29b2e
imc: fix order of operations in coefficients read
...
Reported-by: Ruoyu <liangry@ucweb.com>
2014-10-15 14:48:07 +01:00
51c810e62b
Merge commit 'd565fef1b83b6c5f8afb32229260b79f67c68109'
...
* commit 'd565fef1b83b6c5f8afb32229260b79f67c68109':
vdpau: add AV_HWACCEL_FLAG_IGNORE_LEVEL to skip the codec level check
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 12:30:07 +02:00
fd937866f7
Merge commit 'c1724623ce0433c6a9ee72133b1fd4db75ec7193'
...
* commit 'c1724623ce0433c6a9ee72133b1fd4db75ec7193':
vdpau: have av_vdpau_bind_context() fail on unsupported flag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 12:17:59 +02:00
a72e75bf98
Merge commit 'e09a947c1a856d9d34199a13ee378fe46be53d3a'
...
* commit 'e09a947c1a856d9d34199a13ee378fe46be53d3a':
doc: fix typing mistake
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 12:08:26 +02:00
e5cfc8fdad
sdp: Provide out of bound parameter sets for HEVC if extradata is set
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-15 12:12:54 +03:00
9b7f932ee5
rtpdec_hevc: Parse out of band vps/sps/pps/sei from fmtp lines
...
These are assembled into extradata in the order vps/sps/pps/sei.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-15 12:12:02 +03:00
557d4c4eca
avconv: replace AVCodecContext.time_base with framerate
2014-10-15 06:38:16 +00:00
2d6e58497e
lavf: switch to AVCodecContext.framerate for demuxing
2014-10-15 06:37:55 +00:00
7ea1b3472a
lavc: deprecate the use of AVCodecContext.time_base for decoding
...
When decoding, this field holds the inverse of the framerate that can be
written in the headers for some codecs. Using a field called 'time_base'
for this is very misleading, as there are no timestamps associated with
it. Furthermore, this field is used for a very different purpose during
encoding.
Add a new field, called 'framerate', to replace the use of time_base for
decoding.
2014-10-15 06:37:43 +00:00
d565fef1b8
vdpau: add AV_HWACCEL_FLAG_IGNORE_LEVEL to skip the codec level check
...
Decoding acceleration may work even if the codec level is higher than
the stated limit of the VDPAU driver. Or the problem may be considered
acceptable by the user. This flag allows skipping the codec level
capability checks and proceed with decoding.
Applications should obviously not set this flag by default, but only if
the user explicitly requested this behavior (and presumably knows how
to turn it back off if it fails).
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-10-15 06:21:56 +00:00
c1724623ce
vdpau: have av_vdpau_bind_context() fail on unsupported flag
...
Currently, no flags are supported.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-10-15 06:21:47 +00:00
e09a947c1a
doc: fix typing mistake
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-10-15 06:21:39 +00:00
676110e6d4
avformat/mxfdec: cleanup if parsing the header metadata fails
...
Fixes memleaks
Fixes: asan_static-oob_87d116_10_201.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 06:08:34 +02:00
0834f2056c
avformat/mxfdec: Fix memleak of packages_refs
...
Fixes: asan_static-oob_87d116_10_201.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 06:08:34 +02:00
aae4f5108d
avformat/mxfdec: Fix memleak of primer_packs
...
Fixes: asan_static-oob_87d116_10_201.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 06:08:28 +02:00
e3b28f10bb
avformat/mxfdec: Fix termination of mxf_data_essence_container_uls
...
Fixes: asan_static-oob_87d116_10_201.mxf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 02:09:17 +02:00
5552594a44
Merge commit 'a74f8121d88e0bdf0d69c22e4b3713032da9300a'
...
* commit 'a74f8121d88e0bdf0d69c22e4b3713032da9300a':
mov: Handle tfdt atoms
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-14 22:24:12 +02:00
99c26805e9
Merge commit 'c2c22c75cf89e2faab34d1ee1d392cfb065439ea'
...
* commit 'c2c22c75cf89e2faab34d1ee1d392cfb065439ea':
movenc: Write tfdt atoms
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-14 22:03:51 +02:00
f43ac02723
avcodec/iirfilter: Make ff_iir_filter_free_state() also zero the freed pointer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-14 20:46:15 +02:00
43fb16cf74
avcodec/iirfilter: Change ff_iir_filter_free_coeffs() so it clears the pointers as well
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-14 18:30:52 +02:00
9946da4976
avcodec/flac_parser: use av_freep(), do not leave stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-14 18:30:31 +02:00
fd367668e1
avcodec/flac_parser: use av_freep(), do not leave stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-14 18:29:49 +02:00
5ee6fb7583
avfilter/vf_pp: add gbrp support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-14 17:15:56 +02:00
Martin Storsjö
Lou Logan
Clément Bœsch
Michael Niedermayer
Vittorio Giovara
Anton Khirnov
Rémi Denis-Courmont