Michael Niedermayer
c23d7de22e
Merge commit '84c0ece5fd9569c0f31804f02a199ecd0e7d13d8'
...
* commit '84c0ece5fd9569c0f31804f02a199ecd0e7d13d8':
hevc: further reduce code duplication in hls_prediction_unit()
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
e078549421
Merge commit 'a7b365ae191f45a0d7ed7b34033d5d0cbdd47139'
...
* commit 'a7b365ae191f45a0d7ed7b34033d5d0cbdd47139':
hevc: reduce code duplication in hls_prediction_unit()
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
30156eab6d
Merge commit 'de1f8ead8993512925a3ee6c7491473414419e55'
...
* commit 'de1f8ead8993512925a3ee6c7491473414419e55':
hevcdsp_template: templatize transquant_bypass
Conflicts:
libavcodec/hevcdsp_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
c192be1968
Merge commit '16c01fb4347312b6d29a6498dad627665b96a20e'
...
* commit '16c01fb4347312b6d29a6498dad627665b96a20e':
hevc: remove an unused function parameter
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
e7fdfbdc58
Merge commit '84b9463984083f4e83948c73c1a5dbaf596ff3f7'
...
* commit '84b9463984083f4e83948c73c1a5dbaf596ff3f7':
hevc: remove a redundant line
See: 83976e40e8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
f1b20930f2
Merge commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e'
...
* commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e':
hevc: do not store rqt_root_cbf in the context
Conflicts:
libavcodec/hevc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
7cbe1e0447
Merge commit '920bca3e2332dced9c78bd14cfc2ff138188bd57'
...
* commit '920bca3e2332dced9c78bd14cfc2ff138188bd57':
hevc: do not store pcm_flag in the context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Anton Khirnov
84c0ece5fd
hevc: further reduce code duplication in hls_prediction_unit()
10 years ago
Anton Khirnov
a7b365ae19
hevc: reduce code duplication in hls_prediction_unit()
10 years ago
Anton Khirnov
de1f8ead89
hevcdsp_template: templatize transquant_bypass
10 years ago
Anton Khirnov
16c01fb434
hevc: remove an unused function parameter
10 years ago
Anton Khirnov
84b9463984
hevc: remove a redundant line
...
pred_mode is overwritten a few lines immediately below.
10 years ago
Anton Khirnov
2c6a7f9348
hevc: do not store rqt_root_cbf in the context
...
It does not need to be accessed outside of hls_coding_unit().
10 years ago
Anton Khirnov
920bca3e23
hevc: do not store pcm_flag in the context
...
It does not need to be accessed outside of hls_coding_unit().
10 years ago
Michael Niedermayer
9421d974bc
ffmpeg: Fix last newline at log level less than "info"
...
Fixes Ticket3058
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
4be03a7a6c
cmdutils: Exit in case of faulty stream specifiers
...
Avoids printing confusing and unrelated errors
Fixes Ticket2772
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Lukasz Marek
3f07dd6e39
ffserver_config: fix possible crash
...
Fixes CID #1254662
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Lukasz Marek
1a054bd187
ffserver_config: do not store preset name
...
Preset are translated to AVOptions.
It is not required to reparse anymore.
Fixes CID #1254667
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Reynaldo H. Verdejo Pinochet
33d6f90e3e
ffserver: drop pointless explicit !=0 checks
...
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
10 years ago
Michael Niedermayer
20bf91f832
avcodec/roqvideoenc: clear freed pointers
...
Avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
7ababb85f9
avcodec/snow: clear freed pointers
...
Avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
00672d2ce5
avcodec/rl2: clear freed pointers
...
Avoid leaving stale pointers in memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
51ddaf6549
avformat/mpeg: fix memleak of sub_name on error
...
Fixes CID1254666
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
62eca2f827
avdevice/xcbgrab: Fix/remove unneeded NULL checks
...
Fixes CID1254664
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
374c907fb3
avcodec/vorbis_parser: Move vp check
...
Fixes null pointer dereference
Fixes CID1251347
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
1de786777e
avcodec/dvdsubdec: Check all fseek()s return codes
...
Fixes CID1254660
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
530eb6acf8
avformat/hlsenc: Free context after hls_append_segment
...
Fixes reading uninitialized memory
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
ce80f9fee9
avformat/segment: export inner muxer timebase
...
Fixes "Non-monotonous DTS in output stream 0:0"
Fixes Ticket4020
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Lukasz Marek
ec01283752
lavf/ffmdec: reident after last commit
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Lukasz Marek
745730c9c2
lavf/ffm: use AVOption API to store/restore stream properties
...
This is a generic solution that will not reqiore modifications when new options are added.
This also fixes problem with current implementation when qmin or qmax=-1.
Only 8 bits was sent and read back as 255.
Fixes #1275
Fixes #1461
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Lukasz Marek
a38e06c1aa
ffserver_config: handle codec private options
...
This commit allows to set codec's private option.
As side effect, it also improves preset support.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Lukasz Marek
2657f00d3f
ffmpeg_opt: use codec private context in ffserver streams
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Lukasz Marek
6690d4c3f5
lavf/ffm: store/restore private codec context
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Lukasz Marek
bee5844ddd
lavu/opt: introduce av_opt_serialize()
...
Function allows to create string containing object's serialized options.
Such string may be passed back to av_set_options_string() in order to restore options.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Lukasz Marek
eec693328a
lavu/opt: introduce av_opt_is_set_to_default()
...
New function allows to check if option is set to its default value
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Lukasz Marek
01974a58df
lavc/options: initialize pkt_timebase
...
It's default in option_table.h is 0, but without this fix it is represented as 0/0.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Lukasz Marek
4a30277a59
lavc/options: set timecode_frame_start to -1 as option default
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Lukasz Marek
c544ffd2ae
lavc/options_table: add pixel_format and video_size options
...
Adding these options simplify ffm format implementation based on AVOption API.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Lukasz Marek
c727006616
lavc/options_table: set min to -1 for timecode_frame_start
...
timecode_frame_start is set to -1 in avcodec_get_context_defaults3()
AVOptions API complains about it.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
10 years ago
Michael Niedermayer
08ee02deca
avfilter/vf_tinterlace: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
f3cba01cce
Merge commit 'c00365b46d464ce47716315c1801818d811bdb9a'
...
* commit 'c00365b46d464ce47716315c1801818d811bdb9a':
aarch64: Make the function pointer tables position independent
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Martin Storsjö
c00365b46d
aarch64: Make the function pointer tables position independent
...
This allows running the code on android, where 64 bit binaries with
text relocations aren't allowed to be loaded.
Signed-off-by: Martin Storsjö <martin@martin.st>
10 years ago
Clément Bœsch
77204f7366
avfilter/xbr: fix style in FILT4() calls
10 years ago
Clément Bœsch
7eece06934
avfilter/xbr: clarify default "interpolated" pixels assignments
10 years ago
Clément Bœsch
bca3c2cfc0
avfilter/xbr: refactor xbr[234]x into a single function
...
No speed difference.
10 years ago
Clément Bœsch
8bc1553cdb
avfilter/xbr: add slice threading
10 years ago
Michael Niedermayer
bd7d8604bd
avcodec/nellymoserenc: update comment to match 5c805d69a4
...
Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Clément Bœsch
454b714283
avfilter/xbr: add video and filtering flags to options
...
Fixes ffmpeg -h filter=xbr
10 years ago
Clément Bœsch
be96201e5b
avfilter/xbr: use function pointers for xbr[234]x
10 years ago
Clément Bœsch
c4fb79a3db
avfilter/xbr: remove FATE test entry from @todo
...
See 57688aecbd
10 years ago