ffmpeg.git
6 years agoMerge commit 'b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c'
Michael Niedermayer [Mon, 9 Dec 2013 12:02:16 +0000 (13:02 +0100)]
Merge commit 'b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c'

* commit 'b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c':
  mxpegdec: use the AVFrame API properly.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'afa21a12bf084f905187615706b0a8d92bc98661'
Michael Niedermayer [Mon, 9 Dec 2013 11:54:59 +0000 (12:54 +0100)]
Merge commit 'afa21a12bf084f905187615706b0a8d92bc98661'

* commit 'afa21a12bf084f905187615706b0a8d92bc98661':
  p*menc: use the AVFrame API properly.

Conflicts:
libavcodec/Makefile
libavcodec/pamenc.c
libavcodec/pnmenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5'
Michael Niedermayer [Mon, 9 Dec 2013 11:32:37 +0000 (12:32 +0100)]
Merge commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5'

* commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5':
  mjpegdec: use the AVFrame API properly.

Conflicts:
libavcodec/mjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd support for picture_ptr field in MJpegDecodeContext
anatoly [Sun, 27 Mar 2011 20:16:25 +0000 (22:16 +0200)]
Add support for picture_ptr field in MJpegDecodeContext

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit e0e3b8b297bae5144f23fd4b46a1309857040b63)

Conflicts:

libavcodec/jpeglsdec.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f0b234ab9e406efee85c17eb435db646092a943b'
Michael Niedermayer [Mon, 9 Dec 2013 10:44:37 +0000 (11:44 +0100)]
Merge commit 'f0b234ab9e406efee85c17eb435db646092a943b'

* commit 'f0b234ab9e406efee85c17eb435db646092a943b':
  avformat: AviSynth demuxer rewrite

Conflicts:
configure
libavformat/avisynth.c

See: b9ad009475f3afb76bd2fbd92936dc4d4cd441ec (as well as later commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomxpegdec: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
mxpegdec: use the AVFrame API properly.

6 years agop*menc: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
p*menc: use the AVFrame API properly.

6 years agomjpegdec: use the AVFrame API properly.
Anton Khirnov [Sat, 9 Nov 2013 09:14:46 +0000 (10:14 +0100)]
mjpegdec: use the AVFrame API properly.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 9 Dec 2013 03:46:24 +0000 (04:46 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Move adding of compat objects out of libc detection

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4958f35a2ebc307049ff2104ffb944f5f457feb3'
Michael Niedermayer [Mon, 9 Dec 2013 03:12:40 +0000 (04:12 +0100)]
Merge commit '4958f35a2ebc307049ff2104ffb944f5f457feb3'

* commit '4958f35a2ebc307049ff2104ffb944f5f457feb3':
  dsputil: Move apply_window_int16 to ac3dsp

Conflicts:
libavcodec/arm/ac3dsp_init_arm.c
libavcodec/arm/ac3dsp_neon.S
libavcodec/x86/ac3dsp_init.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocommon.mak: Less ugly version of the previous windres fix
James Almer [Mon, 9 Dec 2013 01:44:52 +0000 (22:44 -0300)]
common.mak: Less ugly version of the previous windres fix

Using subst here is a really ugly hack

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Move MinGW64 specific check to the correct place
James Almer [Sun, 8 Dec 2013 19:13:07 +0000 (16:13 -0300)]
configure: Move MinGW64 specific check to the correct place

It was misplaced during merge of commit 120797e2ef0ca317daf63ad79be5f72f835e9ac2

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocommon.mak: fix the current fate failures with windres
James Almer [Sun, 8 Dec 2013 18:57:36 +0000 (15:57 -0300)]
common.mak: fix the current fate failures with windres

Tested-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/ffv1enc: support forcing experimental 1.4 version
Michael Niedermayer [Sun, 8 Dec 2013 23:39:02 +0000 (00:39 +0100)]
avcodec/ffv1enc: support forcing experimental 1.4 version

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/ffv1: support adjusting the g vs r + b coefficient in the RCT
Michael Niedermayer [Sun, 8 Dec 2013 21:09:50 +0000 (22:09 +0100)]
avcodec/ffv1: support adjusting the g vs r + b coefficient in the RCT

about 1% better compression

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat: AviSynth demuxer rewrite
d s [Wed, 27 Nov 2013 02:58:28 +0000 (21:58 -0500)]
avformat: AviSynth demuxer rewrite

Directly loads AviSynth through LoadLibrary instead of relying on
Video for Windows, and supports using AvxSynth (via dlopen) to
open scripts on Linux and OS X.

Error messages from AviSynth/AvxSynth are now reported through
av_log and exit, rather than the traditional behavior of generating
an error video that the user would need to watch to diagnose.

The main rewrite was authored by d s <avxsynth.testing@gmail.com>
from the AvxSynth team, with additional contributions by

Oka Motofumi <chikuzen.mo@gmail.com>
Stephen Hutchinson <qyot27@gmail.com>
Diego Biurrun <diego@biurrun.de>
Anton Khirnov <anton@khirnov.net>

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agoconfigure: Move adding of compat objects out of libc detection
Diego Biurrun [Mon, 2 Dec 2013 04:06:02 +0000 (23:06 -0500)]
configure: Move adding of compat objects out of libc detection

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 8 Dec 2013 18:00:28 +0000 (19:00 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Separate MinGW32 and MinGW64 libc handling

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/rtpdec: Enable GSM RTP depacketization
Andrey Utkin [Thu, 5 Dec 2013 20:35:03 +0000 (22:35 +0200)]
avformat/rtpdec: Enable GSM RTP depacketization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Special case libfreetype test
Alexander Strasser [Fri, 6 Dec 2013 16:20:26 +0000 (17:20 +0100)]
configure: Special case libfreetype test

Include the freetype header, in-directly through a macro, like it
is done in the drawtext filter. Do not break if the header is moved.

Unfortunately the drawtext filter included the file where the include
macros are defined in a wrong way. This is not needed and breaks the
build. Remove that #include line too.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
6 years agodsputil: Move apply_window_int16 to ac3dsp
Diego Biurrun [Fri, 6 Dec 2013 12:22:40 +0000 (12:22 +0000)]
dsputil: Move apply_window_int16 to ac3dsp

The (optimized) functions are used nowhere else.

6 years agoavfilter/vf_mergeplanes: specify pixel format min/max
Michael Niedermayer [Sat, 7 Dec 2013 14:41:40 +0000 (15:41 +0100)]
avfilter/vf_mergeplanes: specify pixel format min/max

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpeg4video: fix 2 more incorrectly associated comments
Michael Niedermayer [Sun, 8 Dec 2013 15:05:47 +0000 (16:05 +0100)]
avcodec/mpeg4video: fix 2 more incorrectly associated comments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 8 Dec 2013 12:49:16 +0000 (13:49 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libvpx: do not mark VP9 as experimental when using libvpx >= 1.3.0

Conflicts:
libavcodec/libvpxdec.c
libavcodec/libvpxenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Separate MinGW32 and MinGW64 libc handling
Diego Biurrun [Mon, 2 Dec 2013 05:12:57 +0000 (00:12 -0500)]
configure: Separate MinGW32 and MinGW64 libc handling

6 years agolibvpxenc: token_parts is VP8 specific
James Almer [Sat, 7 Dec 2013 19:33:58 +0000 (16:33 -0300)]
libvpxenc: token_parts is VP8 specific

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibvpx: do not mark VP9 as experimental when using libvpx >= 1.3.0
Guillaume Martres [Fri, 15 Nov 2013 22:28:30 +0000 (23:28 +0100)]
libvpx: do not mark VP9 as experimental when using libvpx >= 1.3.0

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agowindres: Track dependencies
James Almer [Sat, 7 Dec 2013 02:45:05 +0000 (23:45 -0300)]
windres: Track dependencies

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'rbultje/vp9-simd'
Michael Niedermayer [Sat, 7 Dec 2013 18:00:03 +0000 (19:00 +0100)]
Merge remote-tracking branch 'rbultje/vp9-simd'

* rbultje/vp9-simd:
  vp9: implement top/left half (4x4) sub-8x8-IDCT.
  vp9: split pre-load of 11585x2 out of 1d idct macro.
  vp9: minor refactorings in idct ssse3 assembly.
  vp9: split x86 assembly in two files.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp9: implement top/left half (4x4) sub-8x8-IDCT.
Ronald S. Bultje [Mon, 2 Dec 2013 02:27:34 +0000 (21:27 -0500)]
vp9: implement top/left half (4x4) sub-8x8-IDCT.

For that specific case (eob>3&&eob<=12), runtime of idct8x8 goes from
668 to 477 cycles. For all idct8x8, runtime goes from 521 to 490 cycles.

6 years agovp9: split pre-load of 11585x2 out of 1d idct macro.
Ronald S. Bultje [Mon, 2 Dec 2013 13:03:04 +0000 (08:03 -0500)]
vp9: split pre-load of 11585x2 out of 1d idct macro.

This allows us to load it only once, instead of twice, in this function.

6 years agovp9: minor refactorings in idct ssse3 assembly.
Ronald S. Bultje [Mon, 2 Dec 2013 13:02:43 +0000 (08:02 -0500)]
vp9: minor refactorings in idct ssse3 assembly.

Make register usage in macros explicit; change mulsub_2w_4x to use 2
instead of 3 temp registers.

6 years agovp9: split x86 assembly in two files.
Ronald S. Bultje [Sun, 1 Dec 2013 21:27:16 +0000 (16:27 -0500)]
vp9: split x86 assembly in two files.

(And in future, loopfilter or intra pred could be put in their own
respective files also.)

6 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sat, 7 Dec 2013 15:11:22 +0000 (16:11 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: set default window size before starting audio
  ffplay: factor out function setting default window size
  ffplay: remove no longer necessary codec flush
  ffplay: do not wait for flushing the picture queue on flush packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/opt: Implement av_opt_set_defaults* in O(N) instead of O(N²) time
Michael Niedermayer [Sat, 7 Dec 2013 11:41:09 +0000 (12:41 +0100)]
avutil/opt: Implement av_opt_set_defaults* in O(N) instead of O(N²) time

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/opt: factor set_string_color() out
Michael Niedermayer [Sat, 7 Dec 2013 12:09:33 +0000 (13:09 +0100)]
avutil/opt: factor set_string_color() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/opt: factor set_string_video_rate() out
Michael Niedermayer [Sat, 7 Dec 2013 12:04:38 +0000 (13:04 +0100)]
avutil/opt: factor set_string_video_rate() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/opt: factor set_string_image_size() out
Michael Niedermayer [Sat, 7 Dec 2013 12:01:38 +0000 (13:01 +0100)]
avutil/opt: factor set_string_image_size() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/utils: remove unused variable
Michael Niedermayer [Sat, 7 Dec 2013 10:59:53 +0000 (11:59 +0100)]
avformat/utils: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 7 Dec 2013 10:48:25 +0000 (11:48 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dcadec: Decode LFE to avoid adding random data when downmixing with LFE

See: 6e7de1144436a6871fdbd7859f3a2ece6e89d9fb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/utils: reject poorly fitting rfps values earlier
Michael Niedermayer [Sat, 7 Dec 2013 03:13:44 +0000 (04:13 +0100)]
avformat/utils: reject poorly fitting rfps values earlier

This avoids collecting statistics for rfps values that very likely
will get rejected later.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mov: use rfps_add_frame() only for video
Michael Niedermayer [Sat, 7 Dec 2013 02:23:49 +0000 (03:23 +0100)]
avformat/mov: use rfps_add_frame() only for video

it makes no sense for other streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale/utils: fill xyz tables only when they will be used
Michael Niedermayer [Sat, 7 Dec 2013 01:04:31 +0000 (02:04 +0100)]
swscale/utils: fill xyz tables only when they will be used

makes the first call to sws_getContext() 1ms faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/utils: run ff_check_pixfmt_descriptors() only when ASSERT_LEVEL is > 0
Michael Niedermayer [Fri, 6 Dec 2013 22:51:58 +0000 (23:51 +0100)]
avutil/utils: run ff_check_pixfmt_descriptors() only when ASSERT_LEVEL is > 0

this safes about 0.1ms

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodcadec: Decode LFE to avoid adding random data when downmixing with LFE
Michael Niedermayer [Thu, 5 Dec 2013 20:06:28 +0000 (21:06 +0100)]
dcadec: Decode LFE to avoid adding random data when downmixing with LFE

Signed-off-by: Tim Walker <tdskywalker@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoavutil/log: skip IO calls on empty strings
Michael Niedermayer [Fri, 6 Dec 2013 22:30:34 +0000 (23:30 +0100)]
avutil/log: skip IO calls on empty strings

These occur when no context is set for example, thus they are common

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/log: skip setting color for default (AV_LOG_INFO) level
Michael Niedermayer [Fri, 6 Dec 2013 22:28:57 +0000 (23:28 +0100)]
avutil/log: skip setting color for default (AV_LOG_INFO) level

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/log: merge calls that set ansi color and print the string
Michael Niedermayer [Fri, 6 Dec 2013 22:27:45 +0000 (23:27 +0100)]
avutil/log: merge calls that set ansi color and print the string

about 1/3 or so faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavresample: Include libavutil/avutil.h in version.h
James Almer [Fri, 6 Dec 2013 01:14:19 +0000 (22:14 -0300)]
avresample: Include libavutil/avutil.h in version.h

Should fix issues compiling lavr's Windows resource file.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'lukaszmluki/master'
Michael Niedermayer [Fri, 6 Dec 2013 19:26:41 +0000 (20:26 +0100)]
Merge remote-tracking branch 'lukaszmluki/master'

* lukaszmluki/master:
  lavd/fbdev_enc: add default device

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: set default window size before starting audio
Marton Balint [Sun, 1 Dec 2013 13:21:25 +0000 (14:21 +0100)]
ffplay: set default window size before starting audio

Fixes ticket #2381.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: factor out function setting default window size
Marton Balint [Sun, 1 Dec 2013 12:25:05 +0000 (13:25 +0100)]
ffplay: factor out function setting default window size

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: remove no longer necessary codec flush
Marton Balint [Sat, 30 Nov 2013 20:18:05 +0000 (21:18 +0100)]
ffplay: remove no longer necessary codec flush

It was introduced in c2e8691c07ca52de7b6b00ba8f2b30c56fd786d7, but since we no
longer no longer provide a custom get_buffer callback, the original cause of
the issue is gone.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: do not wait for flushing the picture queue on flush packet
Marton Balint [Sun, 24 Nov 2013 21:51:13 +0000 (22:51 +0100)]
ffplay: do not wait for flushing the picture queue on flush packet

It is no longer necessary. Also do frame timer and video current pos reset in
the main thread because with the wait removed, the timing would not be optimal
in the read thread.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agolavf/mux: Don't write "encoder" metadata tag when bitexact is requested
James Almer [Fri, 6 Dec 2013 03:35:35 +0000 (00:35 -0300)]
lavf/mux: Don't write "encoder" metadata tag when bitexact is requested

Since we don't write lavf's string when bitexact is requested, this will
prevent the tag from being copied from the source stream.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavd/fbdev_enc: add default device
Lukasz Marek [Thu, 7 Nov 2013 18:06:38 +0000 (19:06 +0100)]
lavd/fbdev_enc: add default device

Use device specified by environment variable FRAMEBUFFER or /dev/fb0 as default.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agoavcodec/error_resilience: check that er is supported before attempting to read the...
Michael Niedermayer [Fri, 6 Dec 2013 15:49:35 +0000 (16:49 +0100)]
avcodec/error_resilience: check that er is supported before attempting to read the status of the previous slice

Fixes incorrectly set error_occured and improves speed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/error_resilience: factor er_supported() check out
Michael Niedermayer [Fri, 6 Dec 2013 15:49:00 +0000 (16:49 +0100)]
avcodec/error_resilience: factor er_supported() check out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/qdm2: move static init to normal init to avoid initializing tables that might...
Michael Niedermayer [Fri, 6 Dec 2013 14:38:20 +0000 (15:38 +0100)]
avcodec/qdm2: move static init to normal init to avoid initializing tables that might never be used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodo O(1) instead of O(n) atomic operations in register functions
Michael Niedermayer [Fri, 6 Dec 2013 14:24:10 +0000 (15:24 +0100)]
do O(1) instead of O(n) atomic operations in register functions

about 1ms faster startup time

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomjpeg/ljpegenc: factor ff_mjpeg_init_hvsample() out
Michael Niedermayer [Fri, 6 Dec 2013 13:24:06 +0000 (14:24 +0100)]
mjpeg/ljpegenc: factor ff_mjpeg_init_hvsample() out

This reduces the amount of duplicated code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpegvideo_enc/frame_end(): remove unused variable
Michael Niedermayer [Fri, 6 Dec 2013 13:19:33 +0000 (14:19 +0100)]
avcodec/mpegvideo_enc/frame_end(): remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mjpegenc/ff_mjpeg_escape_FF: remove unused variable
Michael Niedermayer [Fri, 6 Dec 2013 13:19:11 +0000 (14:19 +0100)]
avcodec/mjpegenc/ff_mjpeg_escape_FF: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 6 Dec 2013 13:13:19 +0000 (14:13 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  webp: add a special case for a huffman table with only 1 symbol

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f51e3a1971045c7ed0c3d9d29d3254a4d940198e'
Michael Niedermayer [Fri, 6 Dec 2013 13:06:53 +0000 (14:06 +0100)]
Merge commit 'f51e3a1971045c7ed0c3d9d29d3254a4d940198e'

* commit 'f51e3a1971045c7ed0c3d9d29d3254a4d940198e':
  webp: do not call av_frame_free() on the user-provided frame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b73a8922d818c7f909855557718d4c3bfacbd92d'
Michael Niedermayer [Fri, 6 Dec 2013 13:01:54 +0000 (14:01 +0100)]
Merge commit 'b73a8922d818c7f909855557718d4c3bfacbd92d'

* commit 'b73a8922d818c7f909855557718d4c3bfacbd92d':
  ljpegenc: split yuv encoding into a separate function

Conflicts:
libavcodec/ljpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fa4476815d0d27996eb199452f2cdbfccdd244a5'
Michael Niedermayer [Fri, 6 Dec 2013 12:55:37 +0000 (13:55 +0100)]
Merge commit 'fa4476815d0d27996eb199452f2cdbfccdd244a5'

* commit 'fa4476815d0d27996eb199452f2cdbfccdd244a5':
  ljpegenc: split bgr encoding into a separate function

Conflicts:
libavcodec/ljpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'daffed3b173c59d64907747bf3309e98a8974f4e'
Michael Niedermayer [Fri, 6 Dec 2013 12:48:20 +0000 (13:48 +0100)]
Merge commit 'daffed3b173c59d64907747bf3309e98a8974f4e'

* commit 'daffed3b173c59d64907747bf3309e98a8974f4e':
  ljpegenc: accept bgr24 instead of bgra

Conflicts:
libavcodec/ljpegenc.c
libavcodec/mjpegenc.c

Only whitespace merged, we continue to support both formats

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0cdbc4d39394965bd8712395b19160da8f3fe144'
Michael Niedermayer [Fri, 6 Dec 2013 12:38:17 +0000 (13:38 +0100)]
Merge commit '0cdbc4d39394965bd8712395b19160da8f3fe144'

* commit '0cdbc4d39394965bd8712395b19160da8f3fe144':
  ljpegenc: rename the encoding function.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '72c0b8f724a71d2784aecad0e5221e7ab6206371'
Michael Niedermayer [Fri, 6 Dec 2013 12:37:04 +0000 (13:37 +0100)]
Merge commit '72c0b8f724a71d2784aecad0e5221e7ab6206371'

* commit '72c0b8f724a71d2784aecad0e5221e7ab6206371':
  ljpeg: remove a commented-out line

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mjpegenc: fix and use lossless flag in ff_mjpeg_encode_picture_header()
Michael Niedermayer [Fri, 6 Dec 2013 12:23:17 +0000 (13:23 +0100)]
avcodec/mjpegenc: fix and use lossless flag in ff_mjpeg_encode_picture_header()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '24abd806ea0cfb0d988d2f0044eac79cff12918c'
Michael Niedermayer [Fri, 6 Dec 2013 11:21:31 +0000 (12:21 +0100)]
Merge commit '24abd806ea0cfb0d988d2f0044eac79cff12918c'

* commit '24abd806ea0cfb0d988d2f0044eac79cff12918c':
  ljpegenc: deMpegEncContextize

Conflicts:
libavcodec/ljpegenc.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
tests/ref/vsynth/vsynth1-ljpeg
tests/ref/vsynth/vsynth2-ljpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/ljpegenc: Dont use ff_mjpeg_encode_stuffing()
Michael Niedermayer [Fri, 6 Dec 2013 10:56:16 +0000 (11:56 +0100)]
avcodec/ljpegenc: Dont use ff_mjpeg_encode_stuffing()

This avoids a use of MpegEncContext

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mjpegenc: move end padding/alignment to ff_mjpeg_escape_FF()
Michael Niedermayer [Fri, 6 Dec 2013 10:55:23 +0000 (11:55 +0100)]
avcodec/mjpegenc: move end padding/alignment to ff_mjpeg_escape_FF()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mjpegenc: make escape_FF() non static
Michael Niedermayer [Fri, 6 Dec 2013 10:49:53 +0000 (11:49 +0100)]
avcodec/mjpegenc: make escape_FF() non static

This will be used by ljpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/ljpegenc: fix mem allocation failure return code encode_picture_lossless()
Michael Niedermayer [Fri, 6 Dec 2013 10:49:17 +0000 (11:49 +0100)]
avcodec/ljpegenc: fix mem allocation failure return code encode_picture_lossless()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d'
Michael Niedermayer [Fri, 6 Dec 2013 10:40:30 +0000 (11:40 +0100)]
Merge commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d'

* commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d':
  mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_dc()

Conflicts:
libavcodec/mjpegenc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3360ad995530ea6967b1e83981b4aa8240fbb0ed'
Michael Niedermayer [Fri, 6 Dec 2013 10:33:07 +0000 (11:33 +0100)]
Merge commit '3360ad995530ea6967b1e83981b4aa8240fbb0ed'

* commit '3360ad995530ea6967b1e83981b4aa8240fbb0ed':
  mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_trailer()

Conflicts:
libavcodec/ljpegenc.c
libavcodec/mjpegenc.c
libavcodec/mjpegenc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '058d5f2feb730846f22c1812e433f92f670ad751'
Michael Niedermayer [Fri, 6 Dec 2013 10:04:27 +0000 (11:04 +0100)]
Merge commit '058d5f2feb730846f22c1812e433f92f670ad751'

* commit '058d5f2feb730846f22c1812e433f92f670ad751':
  mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_header()

Conflicts:
libavcodec/mjpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: rename asrc_aevalsrc.c to aeval.c
Stefano Sabatini [Fri, 6 Dec 2013 09:33:55 +0000 (10:33 +0100)]
lavfi: rename asrc_aevalsrc.c to aeval.c

The file now contains both source and filter, the new name looks more
appropriate.

6 years agolavfi: add aeval filter
Stefano Sabatini [Thu, 5 Dec 2013 17:23:06 +0000 (18:23 +0100)]
lavfi: add aeval filter

6 years agolavfi/aevalsrc: duplicate last expression for the missing channels
Stefano Sabatini [Fri, 6 Dec 2013 09:26:11 +0000 (10:26 +0100)]
lavfi/aevalsrc: duplicate last expression for the missing channels

Use last expression for the missing channel expressions in case the
channel layout was specified. Enhance flexibility.

6 years agodoc: add script to compute texi files dependencies
Stefano Sabatini [Tue, 28 May 2013 19:52:33 +0000 (21:52 +0200)]
doc: add script to compute texi files dependencies

Replace the inline awk script with a Perl script which tracks the
dependencies recursively.

This allows to correctly track dependencies for files including files
with a second level include (for example: ffmpeg-devices.texi ->
devices.texi -> outdevs.texi).

This also adds a dependency on perl for computing the dependencies, which
should not be a problem since perl is already required all the way for
building documentation.

This is a variant of commit 628ceac6526724d35cb390cc1f88344f4ea22eb4
which was reverted due to out-of-tree build failure.

6 years agoMerge commit '6d70639c7d5fe762c5f18de574eafa817fb53ef7'
Michael Niedermayer [Fri, 6 Dec 2013 09:14:15 +0000 (10:14 +0100)]
Merge commit '6d70639c7d5fe762c5f18de574eafa817fb53ef7'

* commit '6d70639c7d5fe762c5f18de574eafa817fb53ef7':
  mjpegenc: do not pass MpegEncContext to jpeg_table_header()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e1eaaec765d2e726618633fcbd2e06fded7647a8'
Michael Niedermayer [Fri, 6 Dec 2013 09:06:43 +0000 (10:06 +0100)]
Merge commit 'e1eaaec765d2e726618633fcbd2e06fded7647a8'

* commit 'e1eaaec765d2e726618633fcbd2e06fded7647a8':
  mjpegenc: remove commented out never-to-be-finished WIP cruft

Conflicts:
libavcodec/mjpegenc.c

The unfinished 2-matrix code is left in place and not removed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ff506c75b71d7aaa1062b49043e0b881b1e263e9'
Michael Niedermayer [Fri, 6 Dec 2013 03:31:10 +0000 (04:31 +0100)]
Merge commit 'ff506c75b71d7aaa1062b49043e0b881b1e263e9'

* commit 'ff506c75b71d7aaa1062b49043e0b881b1e263e9':
  mjpegenc: do not pass MpegEncContext to put_huffman_table()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a1ba1f20b350cb89e645f17bdb237d027170db33'
Michael Niedermayer [Fri, 6 Dec 2013 03:25:56 +0000 (04:25 +0100)]
Merge commit 'a1ba1f20b350cb89e645f17bdb237d027170db33'

* commit 'a1ba1f20b350cb89e645f17bdb237d027170db33':
  mjpegenc: cosmetics, reformat jpeg_put_comments()

Conflicts:
libavcodec/mjpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0812f5a40a0a190172b6de6e91755b882472ddc5'
Michael Niedermayer [Fri, 6 Dec 2013 03:18:02 +0000 (04:18 +0100)]
Merge commit '0812f5a40a0a190172b6de6e91755b882472ddc5'

* commit '0812f5a40a0a190172b6de6e91755b882472ddc5':
  mjpegenc: write the JFIF header if the sample aspect ratio is set

Conflicts:
libavcodec/mjpegenc.c

See: f3ce748d3453a490f32a5518f9cf6bef6892a30c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '66499f34b56fc6a9fdef25543bd9d576fc787895'
Michael Niedermayer [Fri, 6 Dec 2013 03:09:47 +0000 (04:09 +0100)]
Merge commit '66499f34b56fc6a9fdef25543bd9d576fc787895'

* commit '66499f34b56fc6a9fdef25543bd9d576fc787895':
  mpegvideo: do not set current_picture_ptr in decoders

Conflicts:
libavcodec/mss2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '58a868968df445068a143f327ced03b6a02baf0d'
Michael Niedermayer [Fri, 6 Dec 2013 03:03:05 +0000 (04:03 +0100)]
Merge commit '58a868968df445068a143f327ced03b6a02baf0d'

* commit '58a868968df445068a143f327ced03b6a02baf0d':
  FATE: drop the last partial frame in the wmv8-drm test

Conflicts:
tests/ref/fate/wmv8-drm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ac1fc92ea410c396594fcd79f5d4491fe6a8cc90'
Michael Niedermayer [Fri, 6 Dec 2013 02:55:12 +0000 (03:55 +0100)]
Merge commit 'ac1fc92ea410c396594fcd79f5d4491fe6a8cc90'

* commit 'ac1fc92ea410c396594fcd79f5d4491fe6a8cc90':
  vc1dec: move setting repeat_pict after frame_start() has been called.

Conflicts:
libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '282c6a1a0ef3e8c8e180c15b39cfe5b89704d848'
Michael Niedermayer [Fri, 6 Dec 2013 02:46:42 +0000 (03:46 +0100)]
Merge commit '282c6a1a0ef3e8c8e180c15b39cfe5b89704d848'

* commit '282c6a1a0ef3e8c8e180c15b39cfe5b89704d848':
  mpegvideo: make ff_release_unused_pictures() static

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c99307caee01441cfde24f3b7b0db3037b7022dc'
Michael Niedermayer [Fri, 6 Dec 2013 02:19:37 +0000 (03:19 +0100)]
Merge commit 'c99307caee01441cfde24f3b7b0db3037b7022dc'

* commit 'c99307caee01441cfde24f3b7b0db3037b7022dc':
  mpegvideo: make frame_size_alloc() static.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0b0a7a751de02464a33717e70352f696372ba1c4'
Michael Niedermayer [Fri, 6 Dec 2013 02:04:32 +0000 (03:04 +0100)]
Merge commit '0b0a7a751de02464a33717e70352f696372ba1c4'

* commit '0b0a7a751de02464a33717e70352f696372ba1c4':
  mpegvideo: move encode-only parts of common_end() to encode_end()

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd0d111d0592bfd6b2b8bcd2321986c0fc493455d'
Michael Niedermayer [Fri, 6 Dec 2013 01:54:45 +0000 (02:54 +0100)]
Merge commit 'd0d111d0592bfd6b2b8bcd2321986c0fc493455d'

* commit 'd0d111d0592bfd6b2b8bcd2321986c0fc493455d':
  mpegvideo: remove commented out cruft from ff_MPV_frame_end()

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpegvideo_enc: fix linesizes in frame_end()
Michael Niedermayer [Fri, 6 Dec 2013 01:38:30 +0000 (02:38 +0100)]
avcodec/mpegvideo_enc: fix linesizes in frame_end()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '381a722562bcc0b623acf6a00a583fe989bcb72a'
Michael Niedermayer [Fri, 6 Dec 2013 01:37:51 +0000 (02:37 +0100)]
Merge commit '381a722562bcc0b623acf6a00a583fe989bcb72a'

* commit '381a722562bcc0b623acf6a00a583fe989bcb72a':
  mpegvideo: split the encoding-only parts of ff_MPV_frame_end() into a separate function

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowebp: add a special case for a huffman table with only 1 symbol
Justin Ruggles [Wed, 4 Dec 2013 21:53:18 +0000 (16:53 -0500)]
webp: add a special case for a huffman table with only 1 symbol

The vlc reader cannot handle 0-bit huffman codes. For most
situations WebP uses the "simple" huffman coding for this case,
but that will only handle symbols up to 255. For the LZ77 distance
codes, larger symbol values are needed, so it can happen in rare
cases that a normal huffman table is used that only has a single
symbol.

6 years agowebp: do not call av_frame_free() on the user-provided frame
Justin Ruggles [Wed, 4 Dec 2013 21:53:17 +0000 (16:53 -0500)]
webp: do not call av_frame_free() on the user-provided frame

Fixes double-free on error.

6 years agoMerge commit 'b7254288d222013e20539c530b1ec5d324ed5352'
Michael Niedermayer [Fri, 6 Dec 2013 01:18:44 +0000 (02:18 +0100)]
Merge commit 'b7254288d222013e20539c530b1ec5d324ed5352'

* commit 'b7254288d222013e20539c530b1ec5d324ed5352':
  mpegvideo: do not update last_non_b_pict_type in update_thread_context()

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