]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Tue, 18 Mar 2014 19:04:18 +0000 (20:04 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
float_dsp: add test program and use it as fate test
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Mar 2014 18:58:18 +0000 (19:58 +0100)]
Merge commit '
d961a79eb07a8911540a0bd356d68ae0cf93c6a1 '
* commit '
d961a79eb07a8911540a0bd356d68ae0cf93c6a1 ':
sbrdsp: move #if to disable all educational code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Mar 2014 18:43:20 +0000 (19:43 +0100)]
Merge commit '
c829b35c08ad8e1df45cca1cd12f084cf1183d07 '
* commit '
c829b35c08ad8e1df45cca1cd12f084cf1183d07 ':
lavc: er: remove unused variable size
No change as the variable is used
Merged-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Tue, 18 Mar 2014 03:00:30 +0000 (00:00 -0300)]
swresample: reuse COMMON_CORE asm where possible
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Daniel Verkamp [Tue, 18 Mar 2014 07:29:26 +0000 (00:29 -0700)]
ff_put_wav_header: remove manual byte counting
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 17 Mar 2014 20:07:34 +0000 (17:07 -0300)]
swresample: change COMMON_CORE_INT16 asm from SSSE3 to SSE2
pshuf+paddd is slightly faster than phaddd.
The real gain is in pre-ssse3 processors like AMD K8 and K10, which get
a big boost in performance compared to the mmxext version
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Mar 2014 13:08:05 +0000 (14:08 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
svq3: directly set pix_fmt and color_range
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Mar 2014 12:30:20 +0000 (13:30 +0100)]
Merge commit '
ca80e15814b77efe8d0ff5a5b0220754bb6c4065 '
* commit '
ca80e15814b77efe8d0ff5a5b0220754bb6c4065 ':
mpegts: Forward error codes in various functions
Conflicts:
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Mar 2014 12:16:56 +0000 (13:16 +0100)]
Merge commit '
86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a '
* commit '
86ba2327e1cf35c6f77d5fb516a1a7a8dce0b98a ':
mpegts: K&R formatting cosmetics
Conflicts:
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Janne Grunau [Mon, 3 Mar 2014 18:15:35 +0000 (19:15 +0100)]
float_dsp: add test program and use it as fate test
Janne Grunau [Tue, 18 Mar 2014 11:33:13 +0000 (12:33 +0100)]
sbrdsp: move #if to disable all educational code
Avoids a warning of the unused function 'autocorrelate'.
Janne Grunau [Tue, 18 Mar 2014 11:09:07 +0000 (12:09 +0100)]
lavc: er: remove unused variable size
The code using it was removed in
d66e305bd1b .
Vittorio Giovara [Mon, 17 Mar 2014 17:53:14 +0000 (18:53 +0100)]
svq3: directly set pix_fmt and color_range
Keiji Costantini [Mon, 17 Mar 2014 17:03:08 +0000 (17:03 +0000)]
mpegts: Forward error codes in various functions
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Keiji Costantini [Mon, 17 Mar 2014 17:03:07 +0000 (17:03 +0000)]
mpegts: K&R formatting cosmetics
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Michael Niedermayer [Tue, 18 Mar 2014 02:57:41 +0000 (03:57 +0100)]
avfilter/src_movie: Check that the pixel format hasnt changed
Fixes assertion failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 18 Mar 2014 01:07:20 +0000 (02:07 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix TARGET_SAMPLES and TARGET_PATH for some fate tests.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Mon, 17 Mar 2014 22:59:36 +0000 (23:59 +0100)]
MAINTAINERS: add myself az mpegts demuxer maintainer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 23:07:53 +0000 (00:07 +0100)]
avcodec/utils: fix sizeof(AVFrame) dependence in avcodec_encode_audio2()
This is a bit tricky, we allocate a correctly sized AVFrame but then only
copy the compile time AVFrame size, this is to ensure that user applications
which do not use the correct av frame API dont end with out of array reads.
Note, applications using the correct API have set extended_data and the
changed code will never be executed for them.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Tue, 18 Mar 2014 00:29:50 +0000 (01:29 +0100)]
Fix TARGET_SAMPLES and TARGET_PATH for some fate tests.
This allows running more fate tests on remote targets
without the source tree.
James Almer [Mon, 17 Mar 2014 19:40:28 +0000 (16:40 -0300)]
x86/synth_filter: improve FMA version
Replace mulps+subps with fnmaddps, resulting in two less instructions inside the
inner loops.
About 1% faster FMA3 performance.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Andrey Utkin [Sun, 9 Mar 2014 00:20:41 +0000 (02:20 +0200)]
doc/examples: Add example transcoding.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 17:22:32 +0000 (18:22 +0100)]
avformat/mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd
This also moves mov_rewrite_dvd_sub_extradata() to mov.c
Fixes: NeroRecodeSample.mp4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 17:21:11 +0000 (18:21 +0100)]
avformat/mov: fill in subtitle dimensions after parsing tkhd
Sample: NeroRecodeSample.mp4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 16:08:39 +0000 (17:08 +0100)]
avformat/isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()
Fixes regression with NeroRecodeSample.mp4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 16:06:30 +0000 (17:06 +0100)]
avformat/isom: Simplify mov_rewrite_dvd_sub_extradata()
This avoids the 2nd buffer and fixes the palette truncated check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 15:28:07 +0000 (16:28 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libx264: check color_range
Conflicts:
libavcodec/libx264.c
See:
48d39c8786d2a1a36258d8e442602729eef0474c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 15:22:28 +0000 (16:22 +0100)]
Merge commit '
bf0d7da7cbbf869605086c2a47cdf87f0a533e24 '
* commit '
bf0d7da7cbbf869605086c2a47cdf87f0a533e24 ':
ljpeg: check color_range
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 15:13:59 +0000 (16:13 +0100)]
Merge commit '
2183432e6dc8aedf1ef3db63006a2a8195479abd '
* commit '
2183432e6dc8aedf1ef3db63006a2a8195479abd ':
mdec: set color_range
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 15:10:17 +0000 (16:10 +0100)]
Merge commit '
1c1fbc70cae44c10af8ff865826e31c17bc9f347 '
* commit '
1c1fbc70cae44c10af8ff865826e31c17bc9f347 ':
mjpeg: set color_range
Conflicts:
libavcodec/mjpegdec.c
See:
2f870e262e953815060de0ebea9b6653133b203e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 14:56:49 +0000 (15:56 +0100)]
Merge commit '
6612a03d7470af4aa6b8aa313b1eff013691d181 '
* commit '
6612a03d7470af4aa6b8aa313b1eff013691d181 ':
fraps: set color_range
Conflicts:
libavcodec/fraps.c
See:
79f452f4e68696f1daa9f205b35037185959c9ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 14:54:48 +0000 (15:54 +0100)]
Merge commit '
5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4 '
* commit '
5b1b91cfb82d56c09846c68b09d2b8b7c8faccc4 ':
tiff: Support rgba encoding
Conflicts:
libavcodec/tiffenc.c
See:
d7fc100694f776092ce07f616dbe0f02e73f347f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 14:51:13 +0000 (15:51 +0100)]
Merge commit '
6d78e852fbf3cab438a2085bcb64b90457c4a851 '
* commit '
6d78e852fbf3cab438a2085bcb64b90457c4a851 ':
img2: add j2c file extension
Conflicts:
libavformat/img2enc.c
See:
e8df18270a50fd57eab06f1718ad9d075b200d98
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 14:43:21 +0000 (15:43 +0100)]
Merge commit '
58c215961a9067bb670387bbd72286c30de04b93 '
* commit '
58c215961a9067bb670387bbd72286c30de04b93 ':
raw, nut: Support rgba64 encoding
Conflicts:
libavcodec/raw.c
libavformat/nut.c
See:
edf34c346ec9d5d1a790db4b500113bf8d5fac07
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 14:32:07 +0000 (15:32 +0100)]
Merge commit '
cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9 '
* commit '
cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9 ':
png: Support rgb48 and rgba64 encoding
Conflicts:
libavcodec/pngenc.c
See:
f94ce3bcab67369b18976f6cf8e69ae132805213
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 14:24:05 +0000 (15:24 +0100)]
Merge commit '
c598b569fb3d1f4b6c4868fe64f6989254df5186 '
* commit '
c598b569fb3d1f4b6c4868fe64f6989254df5186 ':
png: K&R formatting cosmetics
Conflicts:
libavcodec/png.c
libavcodec/pngdec.c
libavcodec/pngenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 13:52:02 +0000 (14:52 +0100)]
Merge commit '
f7518f1a0e0a1788c303de3c6198da07e575710c '
* commit '
f7518f1a0e0a1788c303de3c6198da07e575710c ':
codec_desc: update dvaudio tag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 13:42:37 +0000 (14:42 +0100)]
Michael Niedermayer [Mon, 17 Mar 2014 13:14:10 +0000 (14:14 +0100)]
Merge commit '
1481d24c3a0abf81e1d7a514547bd5305232be30 '
* commit '
1481d24c3a0abf81e1d7a514547bd5305232be30 ':
RGBA64 pixel formats
Conflicts:
doc/APIchanges
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
libswscale/utils.c
See:
9569a3c9f41387a8c7d1ce97d8693520477a66c3
See:
92afb431621c79155fcb7171d26f137eb1bee028 , as well as others
Note: the enum values added in libav are incompatible/different to what ffmpeg used since 3 years
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 12:46:09 +0000 (13:46 +0100)]
Merge commit '
d24e9a99a40166bf881ccd2e3ae5688af4726658 '
* commit '
d24e9a99a40166bf881ccd2e3ae5688af4726658 ':
h264 does not depend on mpegvideo any more
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 12:35:23 +0000 (13:35 +0100)]
avcodec/vdpau: update ff_vdpau_h264_set_reference_frames() to H264Picture
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 12:31:28 +0000 (13:31 +0100)]
Merge commit '
7245a0ae872d4f65396a37d13f5d1d2c2efe11c2 '
* commit '
7245a0ae872d4f65396a37d13f5d1d2c2efe11c2 ':
mpegvideo: remove h264-only fields
Conflicts:
libavcodec/mpegvideo.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 12:23:48 +0000 (13:23 +0100)]
Merge commit '
be039278b5ebd8075d90a3508db2aed5adf59e02 '
* commit '
be039278b5ebd8075d90a3508db2aed5adf59e02 ':
mpegvideo: move ff_draw_horiz_band() to mpegutils.c
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 12:22:40 +0000 (13:22 +0100)]
avcodec/dxva2: fix pointers after H264Picture
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 11:57:42 +0000 (12:57 +0100)]
avcodec/vdpau: fix ff_vdpau_get_surface_id() argument after H264Picture
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 11:45:36 +0000 (12:45 +0100)]
avcodec/vaapi: fix pointer types after H264Picture changes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 11:33:33 +0000 (12:33 +0100)]
Merge commit '
e0c16e4e3259cf50b5bac4c23bb6e517f397c74b '
* commit '
e0c16e4e3259cf50b5bac4c23bb6e517f397c74b ':
mpegvideo: move mpegvideo formats-related defines to mpegutils.h
Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_mvpred.h
libavcodec/svq1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 11:24:16 +0000 (12:24 +0100)]
Merge commit '
136034d86b5cb1819a2c3e6ecdfeb05dcba7140d '
* commit '
136034d86b5cb1819a2c3e6ecdfeb05dcba7140d ':
h264: Remove MotionEstContext and move the relevant fields to H264Context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 05:16:18 +0000 (06:16 +0100)]
Merge commit '
e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c '
* commit '
e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c ':
h264: Replace mpegvideo-specific MAX_THREADS by private define
Conflicts:
libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 04:59:01 +0000 (05:59 +0100)]
Merge commit '
5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27 '
* commit '
5d1c2e53ab3ce27b48c138d22bb01ff8e8304f27 ':
h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define
Conflicts:
libavcodec/h264.c
libavcodec/h264_ps.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 04:52:05 +0000 (05:52 +0100)]
avcodec/h264: h264_set_erpic() clear destination
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 04:49:10 +0000 (05:49 +0100)]
Merge commit '
9b749c8274f6b6f35dde2cf29b99fa4f719abf87 '
* commit '
9b749c8274f6b6f35dde2cf29b99fa4f719abf87 ':
h264: move relevant fields from Picture to H264Picture
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 04:22:20 +0000 (05:22 +0100)]
avcodec/error_resilience: fix the case when MVs are not available
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 04:13:59 +0000 (05:13 +0100)]
avcodec/mpegvideo: ff_mpeg_set_erpic() clear destination
Fixes crash
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 03:59:21 +0000 (04:59 +0100)]
Merge commit '
d66e305bd1b4f3e91ae4e7e549148509d0811672 '
* commit '
d66e305bd1b4f3e91ae4e7e549148509d0811672 ':
er: move relevant fields from Picture to ERPicture
Conflicts:
libavcodec/error_resilience.c
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 03:41:16 +0000 (04:41 +0100)]
Merge commit '
1c79b1625d4d257bfd01eccb84cc0ab355fb9a9e '
* commit '
1c79b1625d4d257bfd01eccb84cc0ab355fb9a9e ':
h264: directly use frames in ff_h264_draw_horiz_band()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 03:34:21 +0000 (04:34 +0100)]
Merge commit '
75af13a '
* commit '
75af13a ':
mpegvideo: directly use frames in ff_draw_horiz_band()
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Matt Oliver [Mon, 17 Mar 2014 03:00:24 +0000 (04:00 +0100)]
avcodec/x86/idct_sse2_xvid: move offsets out of MANGLE()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 17 Mar 2014 01:25:20 +0000 (02:25 +0100)]
avcodec/h264: be more tolerant on what pixel format changes trigger reinits
Fixes Ticket3260
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matt Oliver [Sun, 16 Mar 2014 03:40:53 +0000 (14:40 +1100)]
Add missing external declarations.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Matt Oliver [Sun, 9 Feb 2014 06:10:12 +0000 (17:10 +1100)]
Fixed 64bit conformance with mvzbl.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Mar 2014 23:06:45 +0000 (00:06 +0100)]
swscale/x86/swscale: remove unused constants
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Wed, 12 Mar 2014 11:05:42 +0000 (12:05 +0100)]
libx264: check color_range
Vittorio Giovara [Wed, 12 Mar 2014 13:31:51 +0000 (14:31 +0100)]
ljpeg: check color_range
Vittorio Giovara [Wed, 12 Mar 2014 13:35:21 +0000 (14:35 +0100)]
mdec: set color_range
Vittorio Giovara [Wed, 12 Mar 2014 09:53:21 +0000 (10:53 +0100)]
mjpeg: set color_range
Vittorio Giovara [Wed, 12 Mar 2014 10:52:40 +0000 (11:52 +0100)]
fraps: set color_range
Carl Eugen Hoyos [Fri, 2 Dec 2011 03:23:07 +0000 (03:23 +0000)]
tiff: Support rgba encoding
Jean First [Sun, 22 Jan 2012 00:11:42 +0000 (00:11 +0000)]
img2: add j2c file extension
Some applications use the j2c extension for jpeg2000 codestream files.
Carl Eugen Hoyos [Thu, 9 Feb 2012 23:25:46 +0000 (23:25 +0000)]
raw, nut: Support rgba64 encoding
Carl Eugen Hoyos [Sun, 15 Jan 2012 22:04:25 +0000 (22:04 +0000)]
png: Support rgb48 and rgba64 encoding
Vittorio Giovara [Fri, 14 Mar 2014 17:32:00 +0000 (18:32 +0100)]
png: K&R formatting cosmetics
Vittorio Giovara [Fri, 14 Mar 2014 18:02:35 +0000 (19:02 +0100)]
codec_desc: update dvaudio tag
Michael Niedermayer [Sun, 16 Mar 2014 12:22:26 +0000 (12:22 +0000)]
isom: fix C99-style declaration
Jean First [Fri, 23 Sep 2011 18:26:20 +0000 (20:26 +0200)]
RGBA64 pixel formats
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Vittorio Giovara [Wed, 12 Mar 2014 09:07:46 +0000 (10:07 +0100)]
h264 does not depend on mpegvideo any more
Vittorio Giovara [Fri, 28 Feb 2014 09:32:46 +0000 (10:32 +0100)]
mpegvideo: remove h264-only fields
Vittorio Giovara [Wed, 12 Mar 2014 09:18:54 +0000 (10:18 +0100)]
mpegvideo: move ff_draw_horiz_band() to mpegutils.c
Drop the mpegvideo dependency for svq3 in configure.
Vittorio Giovara [Fri, 28 Feb 2014 12:40:54 +0000 (13:40 +0100)]
mpegvideo: move mpegvideo formats-related defines to mpegutils.h
Vittorio Giovara [Thu, 27 Feb 2014 17:43:28 +0000 (18:43 +0100)]
h264: Remove MotionEstContext and move the relevant fields to H264Context
Unused buffers scratchpad and temp have been dropped too.
Vittorio Giovara [Fri, 28 Feb 2014 12:21:59 +0000 (13:21 +0100)]
h264: Replace mpegvideo-specific MAX_THREADS by private define
Vittorio Giovara [Thu, 27 Feb 2014 16:07:30 +0000 (17:07 +0100)]
h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define
Vittorio Giovara [Wed, 12 Mar 2014 08:13:07 +0000 (09:13 +0100)]
h264: move relevant fields from Picture to H264Picture
Vittorio Giovara [Fri, 28 Feb 2014 10:31:56 +0000 (11:31 +0100)]
er: move relevant fields from Picture to ERPicture
This is done to disentangle ER from mpegvideo. In order to use a
classic Picture, callers can use ff_mpeg_set_erpic() or use a custom function
to set the fields. Please note that buffers need to be allocated before
calling ff_er_frame_end().
Vittorio Giovara [Tue, 4 Mar 2014 14:30:19 +0000 (15:30 +0100)]
h264: directly use frames in ff_h264_draw_horiz_band()
Vittorio Giovara [Tue, 4 Mar 2014 11:02:27 +0000 (12:02 +0100)]
mpegvideo: directly use frames in ff_draw_horiz_band()
Michael Niedermayer [Sun, 16 Mar 2014 21:38:00 +0000 (22:38 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aacdec: Lower the number of frames required to detect ADTS
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Mar 2014 21:25:09 +0000 (22:25 +0100)]
Merge commit '
0412cb67cda05b08dfca6bfc4ff664ea917fa932 '
* commit '
0412cb67cda05b08dfca6bfc4ff664ea917fa932 ':
aacdec: Don't count probed ADTS frames if there are false positives
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Tue, 11 Mar 2014 13:52:46 +0000 (15:52 +0200)]
aacdec: Lower the number of frames required to detect ADTS
For live audio streams, requiring 500 frames for a stream to
be detected is a bit overkill.
This allows live ADTS streams that don't start nicely at
a frame boundary to start up more quickly, e.g.
http://mp3.streampower.be/radio1.aac.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Tue, 11 Mar 2014 13:42:44 +0000 (15:42 +0200)]
aacdec: Don't count probed ADTS frames if there are false positives
If a portion of the probe buffer seem to resemble ADTS frames,
but some data at the end is a mismatch, disregard the whole
probing attempt. If it actually is ADTS data, there shouldn't be
any mismatches within the sequential frame data.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sun, 16 Mar 2014 18:15:58 +0000 (19:15 +0100)]
Changelog: move post 2.2 branching entries out of the 2.2 changelog
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sat, 15 Mar 2014 06:28:01 +0000 (17:28 +1100)]
Phantom Cine demuxer (iteration 2014.3)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sat, 15 Mar 2014 06:26:58 +0000 (17:26 +1100)]
avcodec/rawdec: decode 16-bit aligned and packed 'raw' pixel formats where bits_per_coded_sample < 16
The bit packing method is communicted via codec_tag:
BIT[0] big-endian packing
BIT[16] 16-bit little endian packing
BIT[32] 32-bit little-endian packing
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Jasper Taylor [Sun, 16 Mar 2014 15:29:30 +0000 (15:29 +0000)]
avfilter/vf_tinterlace: Fix vf_tinterlace mode 6 (interlacex2)
The purpose of this filter mode is to allow interlaced content to
display properly in interlaced video modes, as described in
http://forum.xbmc.org/showthread.php?tid=81834 and
https://github.com/mpv-player/mpv/issues/624#issuecomment-
37685195 . The
filter doubles the video frame rate, but does not work properly because:
(1) it does not set the properties of the output stream to indicate the
doubled frame rate, and
(2) it does not set an appropriate PTS on the extra frames.
The attached patch fixes these problems by settling these values the
same way they are set in vf_yadif mode 1 (field) which also doubles the
frame rate.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Mar 2014 15:34:46 +0000 (16:34 +0100)]
avformat/movenc: omit avformat ident from isml_manifest for bitexact mode
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Mar 2014 15:32:03 +0000 (16:32 +0100)]
avformat/movenc: omit LIBAVCODEC_IDENT for bitexact mode from uuidusmt_tag
This code is apparently not tested by fate
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Mar 2014 15:26:04 +0000 (16:26 +0100)]
avformat/movenc: only ommit encoder tag of the metadata for bitexact mode
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Mar 2014 14:15:02 +0000 (15:15 +0100)]
ffmpeg_opt: check that a subtitle encoder is available before auto mapping streams
Fixes Ticket3470
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Mar 2014 13:32:47 +0000 (14:32 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: add a test for the ONE_STR mapping mode of the channelmap filter
Conflicts:
tests/fate/filter-audio.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 16 Mar 2014 13:17:41 +0000 (14:17 +0100)]
Merge commit '
e843612695007cc623813073754c651ab43021f7 '
* commit '
e843612695007cc623813073754c651ab43021f7 ':
af_channelmap: fix ONE_STR mapping mode
Merged-by: Michael Niedermayer <michaelni@gmx.at>