generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
67,829 Commits 24 Branches 241 Tags 173 MiB
4e20e94921
Commit Graph

67829 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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>
 2014-11-16 01:13:38 +01:00
Lukasz Marek
2657f00d3f ffmpeg_opt: use codec private context in ffserver streams 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-16 01:13:38 +01:00
Lukasz Marek
6690d4c3f5 lavf/ffm: store/restore private codec context 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-16 01:13:38 +01:00
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>
 2014-11-16 01:13:38 +01:00
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>
 2014-11-16 01:13:38 +01:00
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>
 2014-11-16 01:13:38 +01:00
Lukasz Marek
4a30277a59 lavc/options: set timecode_frame_start to -1 as option default 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-11-16 01:13:38 +01:00
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>
 2014-11-16 01:13:38 +01:00
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>
 2014-11-16 01:13:38 +01:00
Michael Niedermayer
08ee02deca avfilter/vf_tinterlace: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-16 01:06:18 +01:00
Michael Niedermayer
f3cba01cce Merge commit 'c00365b46d464ce47716315c1801818d811bdb9a' 
* commit 'c00365b46d464ce47716315c1801818d811bdb9a':
  aarch64: Make the function pointer tables position independent

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-16 01:05:31 +01:00
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>
 2014-11-16 01:07:24 +02:00
Clément Bœsch
77204f7366 avfilter/xbr: fix style in FILT4() calls 2014-11-15 22:48:22 +01:00
Clément Bœsch
7eece06934 avfilter/xbr: clarify default "interpolated" pixels assignments 2014-11-15 22:46:19 +01:00
Clément Bœsch
bca3c2cfc0 avfilter/xbr: refactor xbr[234]x into a single function 
No speed difference.
 2014-11-15 22:35:29 +01:00
Clément Bœsch
8bc1553cdb avfilter/xbr: add slice threading 2014-11-15 22:15:32 +01:00
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>
 2014-11-15 22:12:35 +01:00
Clément Bœsch
454b714283 avfilter/xbr: add video and filtering flags to options 
Fixes ffmpeg -h filter=xbr
 2014-11-15 21:22:00 +01:00
Clément Bœsch
be96201e5b avfilter/xbr: use function pointers for xbr[234]x 2014-11-15 21:18:18 +01:00
Clément Bœsch
c4fb79a3db avfilter/xbr: remove FATE test entry from @todo 
See 57688aecbd
 2014-11-15 21:13:18 +01:00
Clément Bœsch
9a796f7f18 avfilter/xbr: consistent copyright header 2014-11-15 21:06:13 +01:00
Clément Bœsch
d1529273fb avfilter/xbr: make xbr[234]x a bit more consistent 2014-11-15 21:06:13 +01:00
Clément Bœsch
a99004a926 avfilter/xbr: misc style fixes 2014-11-15 21:01:40 +01:00
Clément Bœsch
fda209b741 avfilter/xbr: simplify left/up conditions 2014-11-15 21:01:40 +01:00
Clément Bœsch
a3c3ee6973 avfilter/xbr: misc cleanup in FILT[234] macros 2014-11-15 21:01:40 +01:00
Clément Bœsch
7e91f77547 avfilter/xbr: refactor src/dst pointers definitions into a macro 2014-11-15 21:01:39 +01:00
Clément Bœsch
18e4bf4f54 avfilter/xbr: refactor the 21 pixels definition into a macro 2014-11-15 21:01:39 +01:00
Clément Bœsch
6bf9786a9b avfilter/xbr: mark source pointers as const 2014-11-15 21:01:36 +01:00
Clément Bœsch
e070484040 avfilter/xbr: simplify width overread checks 2014-11-15 20:31:41 +01:00
Clément Bœsch
55f05ac0f1 avfilter/xbr: use different macro names for each dimension 2014-11-15 20:31:41 +01:00
Clément Bœsch
9f9c741771 avfilter/xbr: avoid unecessary macro redirections 2014-11-15 20:31:41 +01:00
Clément Bœsch
086487b633 avfilter/xbr: localize some filtering variables 2014-11-15 20:31:41 +01:00
Clément Bœsch
08bb6f919c avfilter/xbr: do not pass unchanging r2y to macros 2014-11-15 20:31:41 +01:00
Stefano Sabatini
aea7616d39 lavfi/xbr: remove relicensing notice from copyright header 
The log is good enough for tracking those changes.
 2014-11-15 20:13:53 +01:00
Michael Niedermayer
dcb10ef9bf Merge commit '2fa6d21124bd2fc0b186290f5313179263bfcfb7' 
* commit '2fa6d21124bd2fc0b186290f5313179263bfcfb7':
  on2avc: Fix out of array access

See: ce6a1ff2a1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 19:23:05 +01:00
Michael Niedermayer
89e705cd5c Merge commit '74d7db586a2e9aeb107e357739c7e4dde0b6991c' 
* commit '74d7db586a2e9aeb107e357739c7e4dde0b6991c':
  dv: Drop a spurious check

Conflicts:
	libavcodec/dvdec.c

See: 5307fa00a4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 19:11:14 +01:00
Arwa Arif
a2f05d3337 lavfi : change xBR filter to LGPL 
Hyllian's message : "Hi, Put lgpl on this and use it as you wish. It's free!"

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 18:54:54 +01:00
Michael Niedermayer
7d37e45f6b avcodec/mpeg4video_parser: fix spurious extradata parse warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 17:30:44 +01:00
Michael Niedermayer
10411afdff avcodec/mpeg4videodec: replace some return -1 by more specific error codes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 17:24:36 +01:00
Michael Niedermayer
18fcdc0981 avcodec/mpeg4videodec: forward return code in ff_mpeg4_decode_picture_header() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 17:09:37 +01:00
Michael Niedermayer
deccb4d827 avformat/http: simplify chained_options copying 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 14:30:32 +01:00
Brandon Lees
ffaf2074eb Fix the timeout option not working when connecting to a HTTP url that requires authentication. 
In http_open_cnx, the patch restores the AVDictionary if connection needs to be re-tried
because of a authentication/redirect status code.

Previously, if a 401/407/30x status code was encountered, http_open_cnx would restart at the redo label, but any options
used by the underlying protocol would be missing because they were removed by the first attempt.

Signed-off-by: Brandon Lees <brandon@n-hega.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 14:30:32 +01:00
Shin-ichi Toyama
12630fa821 avcodec/dvdsubdec: New option for obtaining global palette from .IFO file (experimental) 
Suggested-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 12:50:39 +01:00
Michael Niedermayer
2fa6d21124 on2avc: Fix out of array access 
CC: libav-stable@libav.org
Bug-Id: CID 1206648
 2014-11-15 12:50:05 +01:00
Luca Barbato
74d7db586a dv: Drop a spurious check 
The buffer is always valid.

Bug-Id: CID 700682
 2014-11-15 12:49:37 +01:00
Mika Raento
b08fd7ea78 mov.c: fix handling of seek return in read_mfra 
this would cause mfra to be ignored in files larger than 2G

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 12:04:34 +01:00
Michael Niedermayer
42c8db69b6 Merge commit '8562c1483ba647f562e4c1df68a9231274b80e6b' 
* commit '8562c1483ba647f562e4c1df68a9231274b80e6b':
  Icecast: Send content-type in all cases

See: 5e08b54f47
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 11:52:43 +01:00
Michael Niedermayer
f3c324a0fe Merge commit '3a6bb9735053c453f806ceab1d91124648d90aca' 
* commit '3a6bb9735053c453f806ceab1d91124648d90aca':
  Icecast: Send 100-continue header if possible

See: 17dc39e76b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-15 11:30:42 +01:00
Marvin Scholz
8562c1483b Icecast: Send content-type in all cases 
This is needed because Icecast since version 2.4.1 doesn't default
to audio/mpeg anymore. AVOption default not used here, since a later
check if -content_type is set is performed and would break.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-11-15 09:15:39 +01:00
Marvin Scholz
3a6bb97350 Icecast: Send 100-continue header if possible 
This allows for proper error reporting. Only do
this for non-legacy requests as only Icecast >2.4.0
will reply with a proper status.
Libav seems to accept both, 100 and 200 status codes, but
let's stay close to spec.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-11-15 09:14:04 +01:00