generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
75,220 Commits 24 Branches 241 Tags 173 MiB
6e611a1839
Commit Graph

75220 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hendrik Leppkes
6e611a1839 Merge commit 'db53a2306f62f05faa67e6f3c60ee55a9b8e4776' 
* commit 'db53a2306f62f05faa67e6f3c60ee55a9b8e4776':
  jpeg2000: Do not warn about known and skippable markers

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 13:16:13 +02:00
Hendrik Leppkes
c074671621 Merge commit '9b5a4a9cce3042558e107ae1ed30d9bf3d867a35' 
* commit '9b5a4a9cce3042558e107ae1ed30d9bf3d867a35':
  mmvideo: Make sure the rle does not write over the frame boundaries

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 13:14:26 +02:00
Hendrik Leppkes
09c15eac3e Merge commit '41ed749fe987e60b0485fa721ad869590651324d' 
* commit '41ed749fe987e60b0485fa721ad869590651324d':
  ogg: Do not try to use the parser if it is not present

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 13:05:01 +02:00
Hendrik Leppkes
eadf6cb2c4 Merge commit '7b02cb29d9d60cdd5ef321043d11d02023e7dc8f' 
* commit '7b02cb29d9d60cdd5ef321043d11d02023e7dc8f':
  pixdesc: Document the component order

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 13:03:04 +02:00
Ronald S. Bultje
a30a8beeb3 vp9: Fix emu[] edge overflow conditions for >8bpp/non-420. 2015-09-12 07:01:48 -04:00
Ronald S. Bultje
2563a33856 vp9: re-initialize internal buffers on bpp change also. 2015-09-12 07:01:47 -04:00
Hendrik Leppkes
6210a64822 Merge commit 'c7ed26ad6035793c7212c17545b0ded18b72db69' 
* commit 'c7ed26ad6035793c7212c17545b0ded18b72db69':
  pixdesc: Add missing alpha flag for yuva420p9be

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 13:00:31 +02:00
Hendrik Leppkes
ba42096d9a Merge commit 'e336c51e6ffcdb93fbcf3c6153d378400608526b' 
* commit 'e336c51e6ffcdb93fbcf3c6153d378400608526b':
  pixdesc: Consistently order components

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2015-09-12 12:54:25 +02:00
James Almer
d5f8a642f6 x86: port PSIGNW to cpuflags 
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-09-11 23:27:03 -03:00
Reynaldo H. Verdejo Pinochet
314bc20d7a ffserver: remove redundant comment, clarify another one 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-09-11 18:33:29 -07:00
Reynaldo H. Verdejo Pinochet
2580395e1c ffserver: unify exit path in http_server() 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-09-11 18:33:13 -07:00
Reynaldo H. Verdejo Pinochet
9a168e9371 ffserver: unify fail path in socket_open_listen() 
Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2015-09-11 18:08:08 -07:00
Ronald S. Bultje
4b66274a86 vp9: save one (PSIGNW) instruction in iadst16_1d sse2/ssse3. 2015-09-11 20:36:51 -04:00
Simon Thelen
b84232694e lavf/webvttenc: Require webvtt file to contain exactly one WebVTT stream. 
Not requiring this can end up producing hilariously broken files
together with -c:s copy (e.g. a webvtt file containing binary subtitle data).

Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-12 02:17:41 +02:00
Ronald S. Bultje
02064d6b7b libvpxdec: apply RGB to 444P16 instead of 422P16. 2015-09-11 19:35:22 -04:00
Alex Agranovsky
9b10ae5727 avformat/format: Remove parameters from mime type before comparission for probing 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-12 00:42:18 +02:00
James Almer
b8e4df46ab configure: check for ID3D11VideoContext 
Should fix compilation with mingw-w64 trunk, where ID3D11VideoDecoder is available
but ID3D11VideoContext still isn't.

Signed-off-by: James Almer <jamrial@gmail.com>
 2015-09-11 18:23:30 -03:00
Alexander S. Drozdov
6a8d58d693 avformat/tcp: TCP Protocol: fix descriptor leak on listen and interrupt 
If we try to listen on TCP port and ff_listen() fails on
interrupt callback socket (bind) descriptor overwrites and
does not closed at all.

As a result, we can't rebind to the same port.

Reviewed-by: Stephan Holljes <klaxa1337@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-11 21:44:30 +02:00
Thierry Foucu
f600381b79 libavformat/utils.c: use correct variable for message. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-11 21:25:33 +02:00
Michael Niedermayer
0ae40c5a70 swscale/swscale: Fix "unused variable" warning 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-11 20:59:32 +02:00
Rostislav Pehlivanov
8180b113e1 aaccoder: respect cutoff when marking bands as PNS 
Makes more sense as users usually set the -cutoff option
to low pass filter the signal. The encoder will still over
shoot slightly when encoding normal coefficients however
that's normal.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
 2015-09-11 18:59:15 +01:00
Luca Barbato
db53a2306f jpeg2000: Do not warn about known and skippable markers 
Matches the openjpeg behaviour.
 2015-09-11 18:19:01 +02:00
Luca Barbato
9b5a4a9cce mmvideo: Make sure the rle does not write over the frame boundaries 
Bug-Id: 887
CC: libav-stable@libav.org
 2015-09-11 18:19:00 +02:00
Paul B Mahol
abef6383fb avformat/wavdec: use AV_OPT_TYPE_BOOL for ignore_length 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-09-11 15:41:18 +00:00
Paul B Mahol
2506244155 avformat/wavenc: use AV_OPT_TYPE_BOOL for write_bext option 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-09-11 15:34:17 +00:00
Michael Niedermayer
8b72f6d50b avcodec/ljpegenc: Fix encoding RGBA LJPEG 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-11 13:45:29 +02:00
Michael Niedermayer
055e56e9f7 avcodec/mjpegdec: Fix decoding RGBA RCT LJPEG 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-11 13:42:05 +02:00
Ganesh Ajjanagadde
07d33439f3 configure: colorize error messages 
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-11 12:57:14 +02:00
Carl Eugen Hoyos
85a7ff8c27 lavc: Fix standalone compilation of the subrip decoder. 2015-09-11 12:39:29 +02:00
Agatha Hu
81071eea7d avcodec/nvenc: change flag of cuCtxCreate to avoid CPU spins 
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
 2015-09-11 10:11:29 +02:00
Michael Niedermayer
f58e011a1f avformat/utils: Increase default max_stream_analyze_duration for flv 
Fixes: unknown_video.flv

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-11 01:12:28 +02:00
Michael Niedermayer
77d03b0ebb avutil/version: Bump for avpriv_get_trc_function_from_trc() and AVCOL_PRI/TRC_SMPTEST428_1 and AVCOL_TRC_SMPTEST2084 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-11 01:12:28 +02:00
Lou Logan
98ecee2d3d doc/filters: fix Photoshop curves file extension 
Found-by: moorej
Signed-off-by: Lou Logan <lou@lrcd.com>
 2015-09-10 14:13:23 -08:00
Kevin Wheatley
a1fa5392e6 avcodec/exr: Mark up the decoded buffer as the appropriate transfer characteristic when applying one 2015-09-10 23:53:05 +02:00
Kevin Wheatley
7eb3233352 avcodec/exr: Add support for applying a transfer characteristic curve to OpenEXR inputs. 
Signed-off-by: Kevin Wheatley <kevin.j.wheatley@gmail.com>
 2015-09-10 23:53:05 +02:00
Kevin Wheatley
bac9048265 avutil/color_utils: Add basic transfer functions for each AVColorTransferCharacteristic 
Most functions are valid over a domain and range of [0.0-1.0] but
some are defined over greater. This patch does not deal with
AVColorRange and assumes AVCOL_RANGE_JPEG for the returned values.

Signed-off-by: Kevin Wheatley <kevin.j.wheatley@gmail.com>
 2015-09-10 23:53:05 +02:00
Ganesh Ajjanagadde
f6e598afa8 avfilter/vf_transpose: use the name 's' for the pointer to the private context 
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
 2015-09-10 21:30:43 +00:00
Ganesh Ajjanagadde
5064b06224 avfilter/f_perms: use the name 's' for the pointer to the private context 
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
 2015-09-10 21:06:58 +00:00
Michael Niedermayer
3ffa77d301 avcodec/options_table: Fix TRC / PRI typo 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-10 22:51:19 +02:00
Michael Niedermayer
24426172d3 avutil/pixfmt: Name "SMPTE ST 428-1" in AVColorPrimaries the same as in AVColorTransferCharacteristic 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-10 22:50:42 +02:00
Michael Niedermayer
b5939ba09c avutil/pixdesc: Use "-" in color_primaries_names to be consistent with color_transfer_names 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-10 22:47:51 +02:00
Kevin Wheatley
6d4b394b5d avutil/pixdesc: Add SMPTE ST 2084 and ST 428-1 pixel descriptions 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-10 22:34:47 +02:00
Kevin Wheatley
7061a30c37 avcodec/options_table: Add SMPTE ST428-1 colour primaries (CIE 1931 XYZ) to command line options 
Signed-off-by: Kevin Wheatley <kevin.j.wheatley@gmail.com>
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-10 22:33:56 +02:00
Kevin Wheatley
47570a265e avcodec/options_table: Add CLI options for SMPTE ST 2084 and ST 428-1 transfer characteristics 
Signed-off-by: Kevin Wheatley <kevin.j.wheatley@gmail.com>
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-10 22:33:39 +02:00
Kevin Wheatley
c3cd6dd106 avutil/pixfmt: Add additional primaries and transfer characteristic enumerations from ITU-T Rec H.265 
Signed-off-by: Kevin Wheatley <kevin.j.wheatley@gmail.com>
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-10 22:32:52 +02:00
Michael Niedermayer
151312890c avcodec/truemotion1: Simplify code using AV_PIX_FMT_0RGB32 
Suggested-by: carl
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-10 22:17:27 +02:00
Clément Bœsch
342ead4491 avformat/subtitles: improve ff_subtitles_queue_finalize() doxy 2015-09-10 21:40:49 +02:00
Clément Bœsch
af924fd9e4 avformat/subtitles: forward log context in ff_subtitles_queue_finalize() for logging 2015-09-10 21:40:07 +02:00
Clément Bœsch
a634649a36 avformat/subtitles: make sure we don't drop "duplicated" events from different streams 2015-09-10 21:39:13 +02:00
Clément Bœsch
4f26c99912 avformat/subtitles: drop duplicated events 
Fix Ticket #4843
 2015-09-10 21:18:34 +02:00