ffmpeg.git
6 years agolavd: add opengl device
Lukasz Marek [Sun, 24 Nov 2013 19:13:27 +0000 (20:13 +0100)]
lavd: add opengl device

It can render to OpenGL context provided by application or into SDL window

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agolavd: add avdevice_dev_to_app_control_message API
Lukasz Marek [Sun, 19 Jan 2014 15:12:07 +0000 (16:12 +0100)]
lavd: add avdevice_dev_to_app_control_message API

New API allows to send messages from devices to application.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agolavd: add avdevice_app_to_dev_control_message API
Lukasz Marek [Sun, 19 Jan 2014 15:11:09 +0000 (16:11 +0100)]
lavd: add avdevice_app_to_dev_control_message API

New API allows to send messages from application to devices.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agodxva2: bump maximum number of slieces for mpeg2
Rainer Hochecker [Mon, 27 Jan 2014 07:16:13 +0000 (08:16 +0100)]
dxva2: bump maximum number of slieces for mpeg2

Suggested by heleppkes on https://trac.ffmpeg.org/ticket/3133

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: remove redundant prototype
Lukasz Marek [Sat, 5 Oct 2013 14:10:41 +0000 (16:10 +0200)]
ffplay: remove redundant prototype

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/huffyuv: support gbrp9/10/12/14
Michael Niedermayer [Mon, 27 Jan 2014 01:05:13 +0000 (02:05 +0100)]
avcodec/huffyuv: support gbrp9/10/12/14

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/huffyuv: update years in copyright
Michael Niedermayer [Mon, 27 Jan 2014 00:45:57 +0000 (01:45 +0100)]
avcodec/huffyuv: update years in copyright

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b7d0d10a1d54073501b728dbe166a32e2b7b26f1'
Michael Niedermayer [Sun, 26 Jan 2014 22:41:43 +0000 (23:41 +0100)]
Merge commit 'b7d0d10a1d54073501b728dbe166a32e2b7b26f1'

* commit 'b7d0d10a1d54073501b728dbe166a32e2b7b26f1':
  x86inc: Speed up assembling with Yasm

See: 4d55fe7204382a75cc4817aeb272257005d442e8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654'
Michael Niedermayer [Sun, 26 Jan 2014 22:35:38 +0000 (23:35 +0100)]
Merge commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654'

* commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654':
  avformat: utils: K&R formatting cosmetics

Conflicts:
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp9: fix invalid ref frame w/h on size change.
Ronald S. Bultje [Sun, 26 Jan 2014 01:30:07 +0000 (20:30 -0500)]
vp9: fix invalid ref frame w/h on size change.

Fixes invalid reads and crashes in vp90-2-05-resize.webm and fuzzed6.ivf.
The output is still not identical to what libvpx does (because we don't
actually scale in MC).

Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp9: disable use_last_frame_mvs on resolution change (scalable).
Ronald S. Bultje [Sun, 26 Jan 2014 01:11:28 +0000 (20:11 -0500)]
vp9: disable use_last_frame_mvs on resolution change (scalable).

Prevents some invalid memory accesses after resolution change in
vp90-2-05-resize.webm, and libvpx does this too.

Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/huffyuvdec: optimize >8bps VLC reading
Michael Niedermayer [Sun, 26 Jan 2014 18:53:14 +0000 (19:53 +0100)]
avcodec/huffyuvdec: optimize >8bps VLC reading

97479 -> 54891 decicycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86inc: Speed up assembling with Yasm
Loren Merritt [Sun, 19 Jan 2014 18:22:55 +0000 (19:22 +0100)]
x86inc: Speed up assembling with Yasm

Work around Yasm's inefficiency with handling large numbers of variables
in the global scope.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoconfigure: add missing dependency for the remuxing example
Stefano Sabatini [Sun, 26 Jan 2014 17:30:37 +0000 (18:30 +0100)]
configure: add missing dependency for the remuxing example

6 years agoavformat: utils: K&R formatting cosmetics
Diego Biurrun [Thu, 16 Jan 2014 00:53:03 +0000 (01:53 +0100)]
avformat: utils: K&R formatting cosmetics

Also adjust some comment wording / spelling and reorder header #includes.

6 years agoffmpeg: use intermediary variables in reap_filters, increase readability
Stefano Sabatini [Fri, 24 Jan 2014 16:27:33 +0000 (17:27 +0100)]
ffmpeg: use intermediary variables in reap_filters, increase readability

6 years agodoc/filters: re-edit notes on filtergraph escaping
Stefano Sabatini [Fri, 24 Jan 2014 10:31:25 +0000 (11:31 +0100)]
doc/filters: re-edit notes on filtergraph escaping

State the escaping rules more explicitly, reword various sentences and
drop confusing quoting example.

Should fix trac issue #3334.

6 years agoavcodec/huffyuvenc: fix end pointer for stats_out
Michael Niedermayer [Sun, 26 Jan 2014 15:24:36 +0000 (16:24 +0100)]
avcodec/huffyuvenc: fix end pointer for stats_out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/huffyuvenc: fail if stats_out is too small instead of silently truncating
Michael Niedermayer [Sun, 26 Jan 2014 15:23:45 +0000 (16:23 +0100)]
avcodec/huffyuvenc: fail if stats_out is too small instead of silently truncating

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add test for 16bps ffvhuff
Michael Niedermayer [Sun, 26 Jan 2014 03:51:38 +0000 (04:51 +0100)]
fate: add test for 16bps ffvhuff

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/libfdk_aacenc: enable 7.1 channel encoding
Jean First [Sun, 26 Jan 2014 00:31:53 +0000 (01:31 +0100)]
avcodec/libfdk_aacenc: enable 7.1 channel encoding

7.1(wide) and 7.1(wide-side) channel layouts are supported in fdk_aac since october 2013 (commit fa3eba1644)

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 26 Jan 2014 02:23:46 +0000 (03:23 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: clang: explicitly state dep file and rule name in DEPFLAGS

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fb87e69ff77f96536768dbae01d82db70c8b41f3'
Michael Niedermayer [Sun, 26 Jan 2014 02:19:03 +0000 (03:19 +0100)]
Merge commit 'fb87e69ff77f96536768dbae01d82db70c8b41f3'

* commit 'fb87e69ff77f96536768dbae01d82db70c8b41f3':
  configure: add missing x86 dependency for i686

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpeg12dec: Revert Change to mpeg2_fast_decode_block_non_intra
Michael Niedermayer [Sun, 26 Jan 2014 01:53:17 +0000 (02:53 +0100)]
avcodec/mpeg12dec: Revert Change to mpeg2_fast_decode_block_non_intra

This fixes the speed regression from 20626f53e9f41cb3db82329ed3db7d773cfa3a8f
and still checks sufficiently to prevent out of allocated memory accesses
due to the index

Before:
1823 decicycles in mpeg2_fast_decode_block_non_intra, 8388493 runs, 115 skips
After:
1808 decicycles in mpeg2_fast_decode_block_non_intra, 8388494 runs, 114 skips

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpeg12dec: Redesign index checks for mpeg2_fast_decode_block_intra
Michael Niedermayer [Sun, 26 Jan 2014 01:53:17 +0000 (02:53 +0100)]
avcodec/mpeg12dec: Redesign index checks for mpeg2_fast_decode_block_intra

This fixes the speed regression from 20626f53e9f41cb3db82329ed3db7d773cfa3a8f
and still checks sufficiently to prevent out of allocated memory accesses
due to the index

Before:
1681 decicycles in mpeg2_fast_decode_block_intra, 4194238 runs, 66 skips
After:
1658 decicycles in mpeg2_fast_decode_block_intra, 4194248 runs, 56 skips

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6d93307f8df81808f0dcdbc064b848054a6e83b3'
Michael Niedermayer [Sun, 26 Jan 2014 01:33:27 +0000 (02:33 +0100)]
Merge commit '6d93307f8df81808f0dcdbc064b848054a6e83b3'

* commit '6d93307f8df81808f0dcdbc064b848054a6e83b3':
  mpeg12: check scantable indices in all decode_block functions

Benchmarks

Before:
1878 decicycles in mpeg2_decode_block_non_intra, 8388487 runs, 121 skips
1700 decicycles in mpeg2_decode_block_intra, 4194239 runs, 65 skips
1808 decicycles in mpeg2_fast_decode_block_non_intra, 8388492 runs, 116 skips
1669 decicycles in mpeg2_fast_decode_block_intra, 4194248 runs, 56 skips
--
2056 decicycles in mpeg1_decode_block_inter, 65535 runs, 1 skips
2346 decicycles in mpeg1_decode_block_intra, 32768 runs, 0 skips
2011 decicycles in mpeg1_fast_decode_block_inter, 65533 runs, 3 skips
----------------
After:
1858 decicycles in mpeg2_decode_block_non_intra, 8388490 runs, 118 skips
1691 decicycles in mpeg2_decode_block_intra, 4194233 runs, 71 skips
1823 decicycles in mpeg2_fast_decode_block_non_intra, 8388493 runs, 115 skips
1681 decicycles in mpeg2_fast_decode_block_intra, 4194238 runs, 66 skips
--
2010 decicycles in mpeg1_decode_block_inter, 65535 runs, 1 skips
2322 decicycles in mpeg1_decode_block_intra, 32766 runs, 2 skips
1995 decicycles in mpeg1_fast_decode_block_inter, 65535 runs, 1 skips

All benchmarks are the best scores of several runs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/internal.h: add timer.h back
Michael Niedermayer [Sun, 26 Jan 2014 01:23:26 +0000 (02:23 +0100)]
avutil/internal.h: add timer.h back

Without this a developer would have to add a include every time he
wants to benchmark some code, this is a moderate inconvenience.

This reverts the specific hunk from fb0c9d41d685abb58575c5482ca33b8cd457c5ec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec'
Michael Niedermayer [Sun, 26 Jan 2014 00:39:33 +0000 (01:39 +0100)]
Merge commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec'

* commit 'fb0c9d41d685abb58575c5482ca33b8cd457c5ec':
  avutil: remove timer.h include from internal.h

Conflicts:
libavcodec/ffv1dec.c
libavutil/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/huffyuv: support AV_PIX_FMT_YUV(A)4XYP16 and GRAY16
Michael Niedermayer [Thu, 23 Jan 2014 00:41:39 +0000 (01:41 +0100)]
avcodec/huffyuv: support AV_PIX_FMT_YUV(A)4XYP16 and GRAY16

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: clang: explicitly state dep file and rule name in DEPFLAGS
Janne Grunau [Sat, 25 Jan 2014 16:34:19 +0000 (17:34 +0100)]
configure: clang: explicitly state dep file and rule name in DEPFLAGS

Fixes dependency file generation with gas-preprocessor.pl and clang.
Flags copied from GCC and tested with Apple's clang from Xcode 5 and
5.1 and clang 3.2, 3.3, 3.4 on Linux.

6 years agoconfigure: add missing x86 dependency for i686
Janne Grunau [Sat, 25 Jan 2014 15:55:58 +0000 (16:55 +0100)]
configure: add missing x86 dependency for i686

6 years agompeg12: check scantable indices in all decode_block functions
Janne Grunau [Fri, 24 Jan 2014 15:22:44 +0000 (16:22 +0100)]
mpeg12: check scantable indices in all decode_block functions

Add checks to the fast functions used with CODEC_FLAGS2_FAST and move
the check for all other functions to before the invalid memory is
accessed. Fixes https://trac.videolan.org/vlc/ticket/9713 with
CODEC_FLAGS2_FAST.

CC: libav-stable@libav.org
6 years agoavutil: remove timer.h include from internal.h
Janne Grunau [Thu, 23 Jan 2014 15:20:23 +0000 (16:20 +0100)]
avutil: remove timer.h include from internal.h

Added libavutil/timer.h include to all files with {START,STOP}_TIMER.

6 years agoavfilter/vf_scale: simplify alignment code
Michael Niedermayer [Sat, 25 Jan 2014 15:54:24 +0000 (16:54 +0100)]
avfilter/vf_scale: simplify alignment code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_scale: do aspect ratio and scale factor compensation together
Michael Niedermayer [Sat, 25 Jan 2014 15:48:13 +0000 (16:48 +0100)]
avfilter/vf_scale: do aspect ratio and scale factor compensation together

Fixes rounding error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge branch 'scale-filter-factor' of https://github.com/lkiesow/FFmpeg
Michael Niedermayer [Sat, 25 Jan 2014 15:35:03 +0000 (16:35 +0100)]
Merge branch 'scale-filter-factor' of https://github.com/lkiesow/FFmpeg

* 'scale-filter-factor' of https://github.com/lkiesow/FFmpeg:
  Documentation for scale filter factor
  Documentation for scale filter factor
  Fixed factor for scale filter
  Factors for scale filter

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/libx264: also consider ticks per frame for fps/timebase setup
Michael Niedermayer [Sat, 25 Jan 2014 15:19:39 +0000 (16:19 +0100)]
avcodec/libx264: also consider ticks per frame for fps/timebase setup

Setting fps = 1/timebase is not correct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/lossless_videodsp: silly one-line cosmetic.
Clément Bœsch [Sat, 25 Jan 2014 15:23:22 +0000 (16:23 +0100)]
x86/lossless_videodsp: silly one-line cosmetic.

6 years agoDocumentation for scale filter factor
Lars Kiesow [Sat, 25 Jan 2014 14:34:23 +0000 (15:34 +0100)]
Documentation for scale filter factor

6 years agoDocumentation for scale filter factor
Lars Kiesow [Sat, 25 Jan 2014 14:02:15 +0000 (15:02 +0100)]
Documentation for scale filter factor

6 years agoFixed factor for scale filter
Lars Kiesow [Sat, 25 Jan 2014 14:00:02 +0000 (15:00 +0100)]
Fixed factor for scale filter

6 years agoFactors for scale filter
Lars Kiesow [Sat, 25 Jan 2014 13:40:48 +0000 (14:40 +0100)]
Factors for scale filter

6 years agox86/lossless_videodsp: use common macro for add and diff int16 loop.
Clément Bœsch [Sat, 25 Jan 2014 10:59:39 +0000 (11:59 +0100)]
x86/lossless_videodsp: use common macro for add and diff int16 loop.

6 years agox86/lossless_videodsp: simplify and explicit aligned/unaligned flags
Clément Bœsch [Thu, 23 Jan 2014 06:58:09 +0000 (07:58 +0100)]
x86/lossless_videodsp: simplify and explicit aligned/unaligned flags

6 years agolavfi/drawtext: add option for drawing border around text
Ramiro Polla [Sat, 18 Jan 2014 05:58:34 +0000 (03:58 -0200)]
lavfi/drawtext: add option for drawing border around text

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/drawtext: get bitmap from glyph in a separate step
Ramiro Polla [Fri, 10 Jan 2014 13:03:12 +0000 (11:03 -0200)]
lavfi/drawtext: get bitmap from glyph in a separate step

This change makes it possible to transform the glyph or get its border before
turning it into a bitmap.

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'rbultje/vp9-simd'
Michael Niedermayer [Sat, 25 Jan 2014 00:43:50 +0000 (01:43 +0100)]
Merge remote-tracking branch 'rbultje/vp9-simd'

* rbultje/vp9-simd:
  vp9: fix memory corruption if header decoding fails after size change.
  vp9/x86: use explicit register for relative stack references.
  vp9/x86: iwht4x4 (lossless) mmx.
  vp9/x86: 4x4 iadst SIMD (ssse3) variants.
  vp9/x86: 8x8 iadst SIMD (ssse3/avx) variants.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 25 Jan 2014 00:39:19 +0000 (01:39 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dxtory: compressed RGB555/RGB565 decoding support

Conflicts:
libavcodec/dxtory.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0e1ad2f591b87e944550c15b54e54f8189743289'
Michael Niedermayer [Sat, 25 Jan 2014 00:33:42 +0000 (01:33 +0100)]
Merge commit '0e1ad2f591b87e944550c15b54e54f8189743289'

* commit '0e1ad2f591b87e944550c15b54e54f8189743289':
  dxtory: add more compressed and uncompressed modes

Conflicts:
libavcodec/dxtory.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp9: fix memory corruption if header decoding fails after size change.
Ronald S. Bultje [Sat, 25 Jan 2014 00:21:57 +0000 (19:21 -0500)]
vp9: fix memory corruption if header decoding fails after size change.

6 years agovp9/x86: use explicit register for relative stack references.
Ronald S. Bultje [Fri, 24 Jan 2014 23:48:56 +0000 (18:48 -0500)]
vp9/x86: use explicit register for relative stack references.

Before this patch, we explicitly modify rsp, which isn't necessarily
universally acceptable, since the space under the stack pointer might
be modified in things like signal handlers. Therefore, use an explicit
register to hold the stack pointer relative to the bottom of the stack
(i.e. rsp). This will also clear out valgrind errors about the use of
uninitialized data that started occurring after the idct16x16/ssse3
optimizations were first merged.

6 years agovp9/x86: iwht4x4 (lossless) mmx.
Ronald S. Bultje [Tue, 21 Jan 2014 01:04:48 +0000 (20:04 -0500)]
vp9/x86: iwht4x4 (lossless) mmx.

6 years agovp9/x86: 4x4 iadst SIMD (ssse3) variants.
Ronald S. Bultje [Mon, 20 Jan 2014 20:30:22 +0000 (15:30 -0500)]
vp9/x86: 4x4 iadst SIMD (ssse3) variants.

Cycle measurements for intra itxfm_4x4_add on ped1080p.webm:
idct_idct:    66 -> 67 cycles (noise measurement)
idct_iadst:  199 -> 79 cycles
iadst_idct:  165 -> 70 cycles
iadst_iadst: 183 -> 82 cycles

6 years agovp9/x86: 8x8 iadst SIMD (ssse3/avx) variants.
Ronald S. Bultje [Mon, 20 Jan 2014 22:11:48 +0000 (17:11 -0500)]
vp9/x86: 8x8 iadst SIMD (ssse3/avx) variants.

Cycle measurements for intra itxfm_8x8_add on ped1080p.webm:
idct_idct:   133 -> 135 cycles (noise measurement)
idct_iadst:  900 -> 241 cycles
iadst_idct:  864 -> 215 cycles
iadst_iadst: 973 -> 310 cycles

6 years agoavcodec/dvbsubdec: Remove unused display_list_size
Michael Niedermayer [Sat, 25 Jan 2014 00:22:48 +0000 (01:22 +0100)]
avcodec/dvbsubdec: Remove unused display_list_size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFixed a memory leak in dvbsubenc.c: sub->num_rects was reduced without freeing the...
Wim Vander Schelden [Tue, 21 Jan 2014 13:38:16 +0000 (14:38 +0100)]
Fixed a memory leak in dvbsubenc.c: sub->num_rects was reduced without freeing the associated rects.

Signed-off-by: Wim Vander Schelden <lists@fixnum.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/avienc: cosmetic indent
James Darnley [Fri, 24 Jan 2014 02:13:47 +0000 (03:13 +0100)]
lavf/avienc: cosmetic indent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/avienc: use metadata_header_padding
James Darnley [Fri, 24 Jan 2014 01:22:50 +0000 (02:22 +0100)]
lavf/avienc: use metadata_header_padding

The muxer will write at least the number of bytes requested and possibly
up to 3 bytes more.  This is because the muxer writes 32-bit integers
and the format requires 4-byte alignment anyway.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/id3v2enc: update comment about minimum padding
James Darnley [Thu, 2 Jan 2014 19:34:35 +0000 (20:34 +0100)]
lavf/id3v2enc: update comment about minimum padding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/id3v2enc: use metadata_header_padding
James Darnley [Mon, 30 Dec 2013 17:13:08 +0000 (18:13 +0100)]
lavf/id3v2enc: use metadata_header_padding

As with the change to flacenc this allows the user to control the amount
of padding they want added to the file.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/flacenc: fix comment after previous change
James Darnley [Sun, 29 Dec 2013 23:41:50 +0000 (00:41 +0100)]
lavf/flacenc: fix comment after previous change

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/flacenc: use metadata_header_padding
James Darnley [Sun, 29 Dec 2013 21:58:27 +0000 (22:58 +0100)]
lavf/flacenc: use metadata_header_padding

Allows a user to control the amount, if any, of padding they want added
to the file.  If set to zero the block will not be written at all.  If
set to some positive number four more bytes will be added to the file
due to the small header required for the block.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAVFormatContext: add metadata_header_padding field
James Darnley [Sun, 29 Dec 2013 21:42:33 +0000 (22:42 +0100)]
AVFormatContext: add metadata_header_padding field

This field is used to store the number of bytes that should be written
as padding to a metadata header of a file.  For example:
 - The FLAC format's METADATA_BLOCK_PADDING [1]
 - The ID3v2 tag format's padding           [2]

[1] http://xiph.org/flac/format.html#metadata_block_padding
[2] http://id3.org/id3v2.3.0#ID3v2_overview

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegts demuxer: store PMT values of DVB teletext to extradata
Serhii Marchuk [Fri, 24 Jan 2014 19:12:48 +0000 (21:12 +0200)]
mpegts demuxer: store PMT values of DVB teletext to extradata

* Using extradata by TS demuxer to store values from PMT
* Support of multiple languages in one DVB teletext stream:
  comma separated language codes in metadata "language" field

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegts muxer: restore PMT table of DVB teletext from extradata
Serhii Marchuk [Fri, 24 Jan 2014 15:34:58 +0000 (17:34 +0200)]
mpegts muxer: restore PMT table of DVB teletext from extradata

* Using extradata by TS muxer to correctly restore PMT table
* PES_header_data_length should be always 0x24 for DVB teletext,
  according to DVB standard

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegts muxer: Change the default subtitle language to "und"
Serhii Marchuk [Fri, 24 Jan 2014 15:34:58 +0000 (17:34 +0200)]
mpegts muxer: Change the default subtitle language to "und"

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/opt: Better print representation of number limits
João Bernardo [Fri, 24 Jan 2014 19:28:51 +0000 (17:28 -0200)]
avutil/opt: Better print representation of number limits

Signed-off-by: João Bernardo Oliveira <jbvsmo@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodxtory: compressed RGB555/RGB565 decoding support
Kostya Shishkov [Tue, 21 Jan 2014 19:11:35 +0000 (20:11 +0100)]
dxtory: compressed RGB555/RGB565 decoding support

6 years agodxtory: add more compressed and uncompressed modes
Kostya Shishkov [Tue, 21 Jan 2014 19:06:11 +0000 (20:06 +0100)]
dxtory: add more compressed and uncompressed modes

6 years agoavcodec/mpeg12dec: fix mis-indented line
Michael Niedermayer [Fri, 24 Jan 2014 16:36:16 +0000 (17:36 +0100)]
avcodec/mpeg12dec: fix mis-indented line

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpeg12dec: Disable the checked bitstream reader
Michael Niedermayer [Fri, 24 Jan 2014 16:33:31 +0000 (17:33 +0100)]
avcodec/mpeg12dec: Disable the checked bitstream reader

Mpeg1/2 should not need it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpeg12dec: Check for overread in mpeg_decode_slice()
Michael Niedermayer [Fri, 24 Jan 2014 16:45:26 +0000 (17:45 +0100)]
avcodec/mpeg12dec: Check for overread in mpeg_decode_slice()

This is needed in case the checked bitstream reader is disabled

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpeg12dec: check block index in mpeg2_fast_decode_block_non_intra()
Michael Niedermayer [Fri, 24 Jan 2014 16:36:47 +0000 (17:36 +0100)]
avcodec/mpeg12dec: check block index in mpeg2_fast_decode_block_non_intra()

Prevents some overreads at the cost of 1 cpu cycle

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpeg12dec: Optimize mpeg1_decode_block_intra()
Michael Niedermayer [Fri, 24 Jan 2014 16:11:39 +0000 (17:11 +0100)]
avcodec/mpeg12dec: Optimize mpeg1_decode_block_intra()

sandybridge i7 274->260 cycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpeg12dec: check for overread in mpeg1_fast_decode_block_inter()
Michael Niedermayer [Fri, 24 Jan 2014 15:46:43 +0000 (16:46 +0100)]
avcodec/mpeg12dec: check for overread in mpeg1_fast_decode_block_inter()

No speedloss meassured

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpeg12dec: Make mpeg2_fast_decode_block_intra() more robust by breaking out...
Michael Niedermayer [Fri, 24 Jan 2014 15:28:39 +0000 (16:28 +0100)]
avcodec/mpeg12dec: Make mpeg2_fast_decode_block_intra() more robust by breaking out on invalid vlcs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 24 Jan 2014 11:47:31 +0000 (12:47 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vp9: fix bugs in updating coef probabilities with parallelmode=1

Conflicts:
libavcodec/vp9.c

No change, the bug/buggy code doesnt seem to be in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'bd01412313c728400f1fc5448ede0ad8b51da0d1'
Michael Niedermayer [Fri, 24 Jan 2014 11:31:43 +0000 (12:31 +0100)]
Merge commit 'bd01412313c728400f1fc5448ede0ad8b51da0d1'

* commit 'bd01412313c728400f1fc5448ede0ad8b51da0d1':
  vp9: fix mvref finding to adhere to bug in libvpx.

Conflicts:
libavcodec/vp9mvs.c

No change
See: dd3d0f46bdb0b9bd204159c67f522cd6f3db7e7c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoexamples/filtering_audio,video: do not call avcodec_register_all()
Stefano Sabatini [Fri, 24 Jan 2014 11:17:40 +0000 (12:17 +0100)]
examples/filtering_audio,video: do not call avcodec_register_all()

It is implied by av_register_all(). Simplify.

6 years agodoc/ffmpeg: reference time syntax sections in ffmpeg-utils for itsoffset and timestam...
Stefano Sabatini [Thu, 23 Jan 2014 17:41:57 +0000 (18:41 +0100)]
doc/ffmpeg: reference time syntax sections in ffmpeg-utils for itsoffset and timestamp options

Avoid doc duplication and desynching.

6 years agovp9: fix bugs in updating coef probabilities with parallelmode=1
Guillaume Martres [Sun, 19 Jan 2014 18:04:59 +0000 (19:04 +0100)]
vp9: fix bugs in updating coef probabilities with parallelmode=1

- The memcpy was completely wrong because
s->prob_ctx[s->framectxid].coef is a [4][2][2][6][6][3] array, whereas
s->prob.coef is a [4][2][2][6][6][11] array.
- The additional check was committed to ffmpeg by Ronald S. Bultje.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agovp9: fix mvref finding to adhere to bug in libvpx.
Ronald S. Bultje [Sun, 19 Jan 2014 18:04:58 +0000 (19:04 +0100)]
vp9: fix mvref finding to adhere to bug in libvpx.

Fixes a particular youtube video that I unfortunately can't share.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoavformat/nutenc: fix missing break in switch
Michael Niedermayer [Fri, 24 Jan 2014 03:17:15 +0000 (04:17 +0100)]
avformat/nutenc: fix missing break in switch

Fixes CID1163848
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/avfilter: fix use of uninitialized pointer
Michael Niedermayer [Fri, 24 Jan 2014 03:14:52 +0000 (04:14 +0100)]
avfilter/avfilter: fix use of uninitialized pointer

Fixes CID1163852
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vc1: fix type of tmp
Michael Niedermayer [Fri, 24 Jan 2014 02:40:37 +0000 (03:40 +0100)]
avcodec/vc1: fix type of tmp

Fixes CID1163850
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/libopenjpegenc: Replace av_frame_alloc() and av_frame_ref() by av_frame_clone()
Michael Niedermayer [Fri, 24 Jan 2014 02:25:47 +0000 (03:25 +0100)]
avcodec/libopenjpegenc: Replace av_frame_alloc() and av_frame_ref() by av_frame_clone()

Simplifies code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mjpegenc: Use av_frame_clone() instead of av_frame_ref()
Michael Niedermayer [Fri, 24 Jan 2014 02:24:55 +0000 (03:24 +0100)]
avcodec/mjpegenc: Use av_frame_clone() instead of av_frame_ref()

This avoids the need for double error checking
Fixes CID1163843

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/libopenjpegenc: Check the return code of av_frame_ref()
Michael Niedermayer [Fri, 24 Jan 2014 01:58:20 +0000 (02:58 +0100)]
avcodec/libopenjpegenc: Check the return code of av_frame_ref()

Fixes CID1163842

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264_cabac: Fix use with the checked bitstream-reader
Michael Niedermayer [Thu, 23 Jan 2014 23:05:17 +0000 (00:05 +0100)]
avcodec/h264_cabac: Fix use with the checked bitstream-reader

Found-by: Dale Curtis <dalecurtis@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavformat/mtv: add missing MTV_ prefix to macro
Reynaldo H. Verdejo Pinochet [Thu, 23 Jan 2014 20:14:52 +0000 (17:14 -0300)]
libavformat/mtv: add missing MTV_ prefix to macro

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agolibavformat/mtv: make clear we assume bpp is always 16
Reynaldo H. Verdejo Pinochet [Thu, 23 Jan 2014 19:18:57 +0000 (16:18 -0300)]
libavformat/mtv: make clear we assume bpp is always 16

All samples in the wild are RGB565/555 and we are already
acting on this assumption when pushing out the video frames,
so if we get anything != than 16 for bpp we just override
this value for doing any calculations making our approach
consistent.

Also avoid repeatedly shifting bpp.

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agolibavformat/mtv: donwgrade probe score for < 512
Reynaldo H. Verdejo Pinochet [Thu, 23 Jan 2014 19:03:09 +0000 (16:03 -0300)]
libavformat/mtv: donwgrade probe score for < 512

MTV has a 512 bytes header. We should be able to
parse required fiels from the first 57 (rest is
padding) but if we haven't seen enough data then
go with SCORE_EXTENSION.

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agolibavformat/mtv: Check for min header size first
Reynaldo H. Verdejo Pinochet [Thu, 23 Jan 2014 18:43:07 +0000 (15:43 -0300)]
libavformat/mtv: Check for min header size first

Abort immediately if we are not getting enough
data to extract the required fields.

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agoCinepak encoder: adding option handling for flexibility
addr-see-the-website@aetey.se [Thu, 23 Jan 2014 15:40:37 +0000 (16:40 +0100)]
Cinepak encoder: adding option handling for flexibility

Now it is possible to adjust compression speed vs R/D when needed
and also skip vintage players compatibility at will.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 23 Jan 2014 19:15:17 +0000 (20:15 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtpdec_asf: Copy the need_parsing field from the chained demuxer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agortpdec_asf: Copy the need_parsing field from the chained demuxer
Martin Storsjö [Thu, 23 Jan 2014 12:07:46 +0000 (14:07 +0200)]
rtpdec_asf: Copy the need_parsing field from the chained demuxer

This fixes playback of mp3 streams in rtp/asf. This used to work
until c6f1dc8, but mostly by coincidence.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoffmpeg: use av_err2str() macro
Stefano Sabatini [Thu, 23 Jan 2014 11:47:48 +0000 (12:47 +0100)]
ffmpeg: use av_err2str() macro

Simplify.

6 years agoffmpeg: apply misc cosmetics to process_input() code
Stefano Sabatini [Thu, 23 Jan 2014 11:46:04 +0000 (12:46 +0100)]
ffmpeg: apply misc cosmetics to process_input() code

6 years agoavformat/matroskaenc: wrap V_QUICKTIME codec private in something that looks like...
Michael Niedermayer [Sun, 19 Jan 2014 19:59:28 +0000 (20:59 +0100)]
avformat/matroskaenc: wrap V_QUICKTIME codec private in something that looks like its part of quicktime stsd

This is needed for matroska spec compliance
Fixes playback of SVQ3 in matroska with vlc
Fixes Ticket 3256

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/http: Properly handle cookies that specify sub-domain where the URL.
Eli Kara [Thu, 23 Jan 2014 08:34:20 +0000 (08:34 +0000)]
avformat/http: Properly handle cookies that specify sub-domain where the URL.

Fixes ticket #3336

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>