Mika Raento
979932378a
ismindex: use tfhd default duration if no sample duration
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-16 09:22:22 +03:00
Michael Lynch
460b509a34
rtsp: Check a memory allocation
...
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-16 09:19:03 +03:00
Di Wu
0e406aba14
mpegts: add the judgement if a new program is created successfully
...
Add the judement after create a new program to avoid segment fault.
Signed-off-by: Di Wu <di1028.wu@samsung.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16 04:21:21 +02:00
Michael Niedermayer
d267a0f8c1
avformat/util: Simplify av_guess_frame_rate() by using AVCodecContext.framerate
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16 02:46:11 +02:00
Michael Niedermayer
004f1c6cf1
avformat/utils: Try to correct the codec_framerate in ff_compute_frame_duration() for the encoding case
...
No testcase where this makes a difference is known
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16 02:46:02 +02:00
Michael Niedermayer
46f52274f3
avformat/oggparsedirac: use AVCodecContext.framerate
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16 01:31:09 +02:00
Michael Niedermayer
7b6a97edd1
avcodec/avcodec: more verbose documentation for time_base
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16 00:28:57 +02:00
Michael Niedermayer
2f7bd04afb
avcodec/avcodec: fix non doxy comment
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16 00:10:38 +02:00
Michael Niedermayer
917f86f479
Merge commit '79dd756e143a54efc25d64e90505f0dca6cbc4ec'
...
* commit '79dd756e143a54efc25d64e90505f0dca6cbc4ec':
rtmpproto: Fix a typo
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-16 00:02:54 +02:00
Michael Niedermayer
f09162c06b
Merge commit 'ced7238cd01cc2199acf9225305628641a27c1d7'
...
* commit 'ced7238cd01cc2199acf9225305628641a27c1d7':
rtpdec_hevc: Use av_realloc instead of av_malloc+memcpy
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 23:23:53 +02:00
Michael Niedermayer
60a876fe7b
Merge commit '752e71e74f50e7a6f9a19edb8e775b2ea2fb94d8'
...
* commit '752e71e74f50e7a6f9a19edb8e775b2ea2fb94d8':
rtpdec_hevc: Rename a variable for clarity
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 22:03:11 +02:00
Michael Niedermayer
16f9f7b881
Merge commit '74b02377980321934e33969c84733ace7e9f4eeb'
...
* commit '74b02377980321934e33969c84733ace7e9f4eeb':
mov: Correctly check the color transfer characteristics range
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 21:40:13 +02:00
Michael Niedermayer
cacc1dcadc
Merge commit '1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d'
...
* commit '1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d':
imc: fix order of operations in coefficients read
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 21:25:10 +02:00
Michael Niedermayer
1b54e6b12b
avformat/mov: auodetect "use_mfra_for"
...
Reviewed-by: Mika Raento <mikie@iki.fi>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 20:17:23 +02:00
Yu Xiaolei
8091fe3071
build: mov_muxer requires ac3_parser
...
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 20:15:59 +02:00
Michael Lynch
c69f230a3a
avformat/rtsp: check memory allocation
...
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Commit message by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 20:04:32 +02:00
Martin Storsjö
79dd756e14
rtmpproto: Fix a typo
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-15 21:00:39 +03:00
Martin Storsjö
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
Martin Storsjö
752e71e74f
rtpdec_hevc: Rename a variable for clarity
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-15 20:54:30 +03:00
Lou Logan
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
Clément Bœsch
52b0a0ecaa
avcodec/ass: add FFmpeg signature
2014-10-15 19:25:06 +02:00
Clément Bœsch
d281a87ae3
avformat/assdec: typo fix
2014-10-15 19:25:06 +02:00
Clément Bœsch
462f2876ce
avcodec/ass_split: realign after addition of new fields
2014-10-15 19:25:06 +02:00
Clément Bœsch
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
Clément Bœsch
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
Clément Bœsch
40b9f28641
avcodec/ass: output missing fields in AVSubtitles and output files
...
Fixes Ticket #3207
2014-10-15 19:25:06 +02:00
Clément Bœsch
bf700a995d
avformat/assenc: support remuxing old V4 ASS form (SSA)
2014-10-15 19:24:40 +02:00
Clément Bœsch
b243393e8b
fate: fix some subtitles tests dependencies
2014-10-15 19:24:39 +02:00
Clément Bœsch
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
Clément Bœsch
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
Lou Logan
b629b421d7
doc/filters: update link to OpenCV docs
...
Signed-off-by: Lou Logan <lou@lrcd.com>
2014-10-15 09:18:54 -08:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
18255441dd
avcodec/dpx: fix framerate
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-15 16:08:36 +02:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Vittorio Giovara
74b0237798
mov: Correctly check the color transfer characteristics range
...
Reported-by: Ruoyu <liangry@ucweb.com>
2014-10-15 14:48:40 +01:00
Vittorio Giovara
1ac5a29b2e
imc: fix order of operations in coefficients read
...
Reported-by: Ruoyu <liangry@ucweb.com>
2014-10-15 14:48:07 +01:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Martin Storsjö
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
Martin Storsjö
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
Anton Khirnov
557d4c4eca
avconv: replace AVCodecContext.time_base with framerate
2014-10-15 06:38:16 +00:00