3dda0bbe42
Merge commit 'e65c776d18dc14df8a279e017760862f9fc8763b'
* commit 'e65c776d18dc14df8a279e017760862f9fc8763b':
rtmpproto: Add getStreamLength call to query duration
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
6cf9d02cea
Merge commit '324b23dde1bc8638959eb32419c95a93906db272'
* commit '324b23dde1bc8638959eb32419c95a93906db272':
rtmpproto: Add function to read a number response
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
1eda312aca
Merge commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4'
* commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4':
cmdutils: Use the correct guard
Conflicts:
cmdutils.c
See: 35daf3ca81
11 years ago
7dba57d1fa
Merge commit '0db6bbb24c1a9f6b5527f460361a5a4132248eee'
* commit '0db6bbb24c1a9f6b5527f460361a5a4132248eee':
avformat: Make avformat_free_context handle NULL
See: ee23dcf534
11 years ago
61c6e69709
Merge commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a'
* commit 'c92965dbfbb7e2b49df14db2fd0e23a29295730a':
avconv: check return value
Conflicts:
ffmpeg.c
See: 4930cd13d6
11 years ago
1dd38e99fd
Merge commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581'
* commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581':
avconv: fix leak in filter error
Conflicts:
ffmpeg_filter.c
See: 14369f59c5
11 years ago
9d1155dae3
Merge commit 'aeb23fc4549a25ef32ff085d2a76227f90caf403'
* commit 'aeb23fc4549a25ef32ff085d2a76227f90caf403':
avprobe: Remove a pointless check
Conflicts:
avprobe.c
No change as the code does not exist in ffprobe
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
ee73a69020
Merge commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc'
* commit 'e58a140cf91d1a9cdfa3115d73c923dab0e9e7dc':
avplay: Always free opts
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
019ff7a0c3
Merge commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767'
* commit 'cf83c0173917a44b89a25ea2b435429bbf9ee767':
avplay: Always free find_stream_info options
Conflicts:
ffplay.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
c40a1bd253
tests/fate/mpeg4: fix samples path
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
a708689fda
Merge commit 'f29c226af0ecc34c417b646580a9acd7d8bbaf48'
* commit 'f29c226af0ecc34c417b646580a9acd7d8bbaf48':
fate: add mpeg4 tests for frame size changes
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
1aed82846c
avformat/m4vdec: mark as possibly containing discontinuities
This will be needed for the resolution change mpeg4 test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
e65c776d18
rtmpproto: Add getStreamLength call to query duration
In (non-live) streams with no metadata, the duration of a stream can
be retrieved by calling the RTMP function getStreamLength with the
playpath. The server will return a positive duration upon the request if
the duration is known, otherwise either no response or a duration of 0
will be returned.
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
324b23dde1
rtmpproto: Add function to read a number response
Packets that contain a number as a result to a rtmp function call are
structured the same way (String, Number, Null, Number). This new method
also includes more bounds checks to better handle packets that are not
structured as expected.
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
47e3e1097e
cmdutils: Use the correct guard
The OptionDef arrays are terminated with a { NULL } element not NULL.
CC: libav-stable@libav.org
Bug-Id: CID 703769
11 years ago
0db6bbb24c
avformat: Make avformat_free_context handle NULL
Work as the other free()-like functions.
Bug-Id: CID 1087081
CC: libav-stable@libav.org
11 years ago
c92965dbfb
avconv: check return value
CC: libav-stable@libav.org
Bug-Id: CID 1224275
11 years ago
c802a2e718
avconv: fix leak in filter error
CC: libav-stable@libav.org
Bug-Id: CID 1005311
11 years ago
aeb23fc454
avprobe: Remove a pointless check
The element is always valid.
CC: libav-stable@libav.org
Bug-Id: CID 732276
11 years ago
e58a140cf9
avplay: Always free opts
CC: libav-stable@libav.org
Bug-Id: CID 733793
11 years ago
cf83c01739
avplay: Always free find_stream_info options
CC: libav-stable@libav.org
Bug-Id: CID 1238794
11 years ago
f29c226af0
fate: add mpeg4 tests for frame size changes
13 years ago
bbd8c85263
doc/filters.texi: fix several typos in the vidstab* sections
Also create an anchor for the unsharp filter, and references to
it in its mentions.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
864f9326fb
x86/vf_noise: move asm code to a separate file
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
11 years ago
f6bb2cd1b0
swresample/resample: fix invert_initial_buffer() after flush
Fixes: asan_heap-uaf_2071250_7_139.ogg
Fixes: assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
080c846f59
swresample: do not put multiple statements in one line
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
8bcf425d06
avformat/id3v2: silence a warning when CONFIG_ZLIB is unset.
dlen is only read when CONFIG_ZLIB is set, so mark it as possibly
unused.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
4f1a252fd3
avfilter/vf_noise: Use a separate seed for each plane
This should reduce the correlation between planes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
ed3efbcd0c
avfilter/vf_noise: use per component rand_shift
This allows using different shifts per plane
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
aba61b22f7
avfilter/vf_noise: move shift calculation to filter_frame()
This makes the temporal noise case deterministic with threads
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
411be72dcb
avfilter/vf_noise: fix high resolution support
Fixes Ticket4017
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
a9b613b60e
Merge commit '979932378ae3fbf452e312eb759cc7ce175f78de'
* commit '979932378ae3fbf452e312eb759cc7ce175f78de':
ismindex: use tfhd default duration if no sample duration
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
293a8e426f
Merge commit '460b509a34fb5fad3bedac8429f53594d3923ea8'
* commit '460b509a34fb5fad3bedac8429f53594d3923ea8':
rtsp: Check a memory allocation
See: c69f230a3a
11 years ago
392b4b663c
Fix initialisers in dct-test.c.
Silences a warning when running fate on unusual platforms:
libavcodec/dct-test.c:101:21: warning: missing braces around initializer [-Wmissing-braces]
libavcodec/dct-test.c:101:21: warning: (near initialization for 'fdct_tab_arch[0]') [-Wmissing-braces]
libavcodec/dct-test.c:102:21: warning: missing braces around initializer [-Wmissing-braces]
libavcodec/dct-test.c:102:21: warning: (near initialization for 'idct_tab_arch[0]') [-Wmissing-braces]
11 years ago
979932378a
ismindex: use tfhd default duration if no sample duration
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
460b509a34
rtsp: Check a memory allocation
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
11 years ago
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>
11 years ago
d267a0f8c1
avformat/util: Simplify av_guess_frame_rate() by using AVCodecContext.framerate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
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>
11 years ago
46f52274f3
avformat/oggparsedirac: use AVCodecContext.framerate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
7b6a97edd1
avcodec/avcodec: more verbose documentation for time_base
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
2f7bd04afb
avcodec/avcodec: fix non doxy comment
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
917f86f479
Merge commit '79dd756e143a54efc25d64e90505f0dca6cbc4ec'
* commit '79dd756e143a54efc25d64e90505f0dca6cbc4ec':
rtmpproto: Fix a typo
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
f09162c06b
Merge commit 'ced7238cd01cc2199acf9225305628641a27c1d7'
* commit 'ced7238cd01cc2199acf9225305628641a27c1d7':
rtpdec_hevc: Use av_realloc instead of av_malloc+memcpy
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
60a876fe7b
Merge commit '752e71e74f50e7a6f9a19edb8e775b2ea2fb94d8'
* commit '752e71e74f50e7a6f9a19edb8e775b2ea2fb94d8':
rtpdec_hevc: Rename a variable for clarity
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
16f9f7b881
Merge commit '74b02377980321934e33969c84733ace7e9f4eeb'
* commit '74b02377980321934e33969c84733ace7e9f4eeb':
mov: Correctly check the color transfer characteristics range
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
cacc1dcadc
Merge commit '1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d'
* commit '1ac5a29b2e5ddeae068deb9d6e0e803a91941d4d':
imc: fix order of operations in coefficients read
Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
1b54e6b12b
avformat/mov: auodetect "use_mfra_for"
Reviewed-by: Mika Raento <mikie@iki.fi>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
8091fe3071
build: mov_muxer requires ac3_parser
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago
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>
11 years ago
Michael Niedermayer
Uwe L. Korn
Luca Barbato
Vittorio Giovara
Janne Grunau
Moritz Barsnick
James Almer
Benoit Fouet
Carl Eugen Hoyos
Mika Raento
Michael Lynch
Di Wu
Yu Xiaolei