ffmpeg.git
7 years agoj2kdec: add AVClass
Michael Niedermayer [Sun, 26 May 2013 16:52:47 +0000 (18:52 +0200)]
j2kdec: add AVClass

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2kdec: cosmetics from jpeg2000
Michael Niedermayer [Sun, 26 May 2013 16:52:31 +0000 (18:52 +0200)]
j2kdec: cosmetics from jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2kdec: merge copyright header with jpeg2000
Michael Niedermayer [Sun, 26 May 2013 16:50:18 +0000 (18:50 +0200)]
j2kdec: merge copyright header with jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2kdec: profile code from jpeg2000
Michael Niedermayer [Sun, 26 May 2013 16:47:53 +0000 (18:47 +0200)]
j2kdec: profile code from jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2kdec: cosmetics from jpeg2000
Michael Niedermayer [Sun, 26 May 2013 16:47:25 +0000 (18:47 +0200)]
j2kdec: cosmetics from jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec/j2kdec: drop disabled debug code
Michael Niedermayer [Sun, 26 May 2013 16:42:00 +0000 (18:42 +0200)]
avcodec/j2kdec: drop disabled debug code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2k/jpeg2000: merge cosmetics and whitespace
Michael Niedermayer [Sun, 26 May 2013 16:32:11 +0000 (18:32 +0200)]
j2k/jpeg2000: merge cosmetics and whitespace

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2kdec: merge jpeg2000_init_static_data() from jpeg2000
Michael Niedermayer [Sun, 26 May 2013 16:27:53 +0000 (18:27 +0200)]
j2kdec: merge jpeg2000_init_static_data() from jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2kdec: move avctx init to decode_frame
Michael Niedermayer [Sun, 26 May 2013 16:26:07 +0000 (18:26 +0200)]
j2kdec: move avctx init to decode_frame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/lut3d: faster tetrahedral interpolation.
Clément Bœsch [Sun, 26 May 2013 16:45:39 +0000 (18:45 +0200)]
lavfi/lut3d: faster tetrahedral interpolation.

Increase performance by fetching only the necessary points.

1097 → 917 decicyles.

7 years agolavfi/lut3d: restore original interpolation speed.
Clément Bœsch [Sun, 26 May 2013 16:36:53 +0000 (18:36 +0200)]
lavfi/lut3d: restore original interpolation speed.

Call NEXT() only once since it got slower due to the overflow condition
introduced in 91b46145.

interp_trilinear:   1462 → 1280 decicycles
interp_tetrahedral: 1188 → 1097 decicycles

Tested on a Core2, GCC 4.8.

7 years agoj2k: s/ff_j2k_getsigctxno/ff_jpeg2000_getsigctxno/g
Michael Niedermayer [Sun, 26 May 2013 16:02:38 +0000 (18:02 +0200)]
j2k: s/ff_j2k_getsigctxno/ff_jpeg2000_getsigctxno/g

Also add a related comment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2k.h: whitespace cosmetics
Michael Niedermayer [Sun, 26 May 2013 16:01:23 +0000 (18:01 +0200)]
j2k.h: whitespace cosmetics

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2k.h: remove disabled debug code
Michael Niedermayer [Sun, 26 May 2013 15:58:44 +0000 (17:58 +0200)]
j2k.h: remove disabled debug code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2k.h: Merges various cosmetics & unused defines
Michael Niedermayer [Sun, 26 May 2013 15:58:12 +0000 (17:58 +0200)]
j2k.h: Merges various cosmetics & unused defines

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2k/jpeg2000: merge copyright
Michael Niedermayer [Sun, 26 May 2013 15:45:15 +0000 (17:45 +0200)]
j2k/jpeg2000: merge copyright

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2k: drop disabled debug code
Michael Niedermayer [Sun, 26 May 2013 15:43:53 +0000 (17:43 +0200)]
j2k: drop disabled debug code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2k: merge ff_j2k_init_tier1_luts()
Michael Niedermayer [Sun, 26 May 2013 15:42:25 +0000 (17:42 +0200)]
j2k: merge ff_j2k_init_tier1_luts()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agojpeg2000/j2k: merge getsigctxno()
Michael Niedermayer [Sun, 26 May 2013 15:39:02 +0000 (17:39 +0200)]
jpeg2000/j2k: merge getsigctxno()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2k: s/getnbctxno/getsigctxno/g
Michael Niedermayer [Sun, 26 May 2013 15:33:08 +0000 (17:33 +0200)]
j2k: s/getnbctxno/getsigctxno/g

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2k: redesign vert_causal_ctx_csty implementation
Michael Niedermayer [Sun, 26 May 2013 14:33:59 +0000 (16:33 +0200)]
j2k: redesign vert_causal_ctx_csty implementation

The old implementation was incomplete and could not have worked
This also fixes some warnings
New code is untested as i dont seem to have a sample file that uses this.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/bbox: export bbox info to frame metadata
Paul B Mahol [Sun, 26 May 2013 09:53:03 +0000 (09:53 +0000)]
lavfi/bbox: export bbox info to frame metadata

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/bbox: timeline support
Paul B Mahol [Sun, 26 May 2013 09:23:39 +0000 (09:23 +0000)]
lavfi/bbox: timeline support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/bbox: make min_val user configurable
Paul B Mahol [Sun, 26 May 2013 09:22:02 +0000 (09:22 +0000)]
lavfi/bbox: make min_val user configurable

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavfi/bbox: use inlink->frame_count
Paul B Mahol [Sun, 26 May 2013 09:12:36 +0000 (09:12 +0000)]
lavfi/bbox: use inlink->frame_count

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavf/swf: remove unused assert include.
Clément Bœsch [Sun, 26 May 2013 13:48:12 +0000 (15:48 +0200)]
lavf/swf: remove unused assert include.

7 years agoj2kdec: fix used bytestream function
Michael Niedermayer [Sun, 26 May 2013 12:53:23 +0000 (14:53 +0200)]
j2kdec: fix used bytestream function

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2k: rename a few inline functions and data tables to match jpeg2000
Michael Niedermayer [Sun, 26 May 2013 11:54:32 +0000 (13:54 +0200)]
j2k: rename a few inline functions and data tables to match jpeg2000

also inlcudes some other cosmetics

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2kdec: prog_order reading from jpeg2000dec
Michael Niedermayer [Sun, 26 May 2013 11:33:10 +0000 (13:33 +0200)]
j2kdec: prog_order reading from jpeg2000dec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoj2k: merge Jpeg2000CodingStyle from jpeg2000
Michael Niedermayer [Sun, 26 May 2013 11:29:49 +0000 (13:29 +0200)]
j2k: merge Jpeg2000CodingStyle from jpeg2000

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomatroska_read_seek: Fix used streams for subtitle index compensation
Michael Niedermayer [Mon, 20 May 2013 02:00:30 +0000 (04:00 +0200)]
matroska_read_seek: Fix used streams for subtitle index compensation

Might fix Ticket1907 (I have no testcase so i cant test)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/noise: use av_image_copy_plane()
Paul B Mahol [Sun, 26 May 2013 10:52:57 +0000 (10:52 +0000)]
lavfi/noise: use av_image_copy_plane()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoav_cpu_count: factorize "detected %d logical cores" message
Michael Niedermayer [Sun, 26 May 2013 00:18:38 +0000 (02:18 +0200)]
av_cpu_count: factorize "detected %d logical cores" message

Also print the message just once

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoav_d2q: Avoid llrint(), its not correctly implemented in old netbsd
Michael Niedermayer [Sun, 26 May 2013 01:18:17 +0000 (03:18 +0200)]
av_d2q: Avoid llrint(), its not correctly implemented in old netbsd

This should fix some fate failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/encoders: Add documentation for libmp3lame
Timothy Gu [Fri, 24 May 2013 19:28:48 +0000 (12:28 -0700)]
doc/encoders: Add documentation for libmp3lame

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 25 May 2013 19:42:56 +0000 (21:42 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  msvc/icl: Intel Compiler support on Windows

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '9495cd170b5786c3518419e873d94eb5e7ada11a'
Michael Niedermayer [Sat, 25 May 2013 19:36:48 +0000 (21:36 +0200)]
Merge commit '9495cd170b5786c3518419e873d94eb5e7ada11a'

* commit '9495cd170b5786c3518419e873d94eb5e7ada11a':
  configure: Fix check_exec_crash for ICL support

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegvideo_enc: do not unreference frames before the code is done with them
Michael Niedermayer [Sat, 25 May 2013 18:29:17 +0000 (20:29 +0200)]
mpegvideo_enc: do not unreference frames before the code is done with them

Fixes Ticket2592

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/mov: Rename alt_sample_size so its name matches what it is
Michael Niedermayer [Sat, 25 May 2013 16:38:49 +0000 (18:38 +0200)]
avformat/mov: Rename alt_sample_size so its name matches what it is

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomsvc/icl: Intel Compiler support on Windows
Alex Smith [Sat, 25 May 2013 10:07:42 +0000 (06:07 -0400)]
msvc/icl: Intel Compiler support on Windows

Initial support for the ICL compiler on windows. Requires a new
c99wrap with ICL support (1.0.2+).

Currently not much different speed wise compared to msvc. In the
future with a few changes it can be made to support the inline asm.
This would be the primary reason for using it.

Passed all fate tests, versions tested:
    13.1.1.171 (2013 Update 3) x86 and x64
    12.1.5.344 (2011 Update 11) x86 and x64

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agoavutil/md5: reindent after previous commits
Giorgio Vazzana [Tue, 21 May 2013 08:36:20 +0000 (10:36 +0200)]
avutil/md5: reindent after previous commits

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoav_d2q: fix rounding for negative values
Michael Niedermayer [Sat, 25 May 2013 13:38:07 +0000 (15:38 +0200)]
av_d2q: fix rounding for negative values

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoav_d2q: Fix infinity check
Michael Niedermayer [Sat, 25 May 2013 13:22:19 +0000 (15:22 +0200)]
av_d2q: Fix infinity check

The old check would fail on huge but not infinite values
and the later code could then fail to handle them correctly in
some cases.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/afade: add timeline support
Paul B Mahol [Sat, 25 May 2013 13:08:13 +0000 (13:08 +0000)]
lavfi/afade: add timeline support

For correct precision one may need to use asetnsamples.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoconfigure: Fix check_exec_crash for ICL support
Laurent [Sat, 25 May 2013 10:01:29 +0000 (06:01 -0400)]
configure: Fix check_exec_crash for ICL support

Change the check_exec_crash test to use a function pointer instead of
simply calling the function. The EBP availability test will crash when
compiled with ICL likely due to compiler optimization shenanigans.

Originally the check_exec_crash code was moved out of main to fix a
problem with gcc's treatment of non-leaf main on x86_32. Libav already
moved the code out of main but the addition of the function pointer will
prevent any inlining which fixes the remaining problem.

A function pointer is used since it is compiler agnostic (as opposed to
say __attribute__ ((noinline)) which would only work with gcc compatible
compilers).

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agoimg2dec: support seeking with ts_from_file
Michael Niedermayer [Sat, 25 May 2013 10:06:14 +0000 (12:06 +0200)]
img2dec: support seeking with ts_from_file

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoimg2dec: dont set start_time/duration to invalid values
Michael Niedermayer [Sat, 25 May 2013 10:05:32 +0000 (12:05 +0200)]
img2dec: dont set start_time/duration to invalid values

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoimg2dec: Add ts_from_file option
Andrey Utkin [Fri, 24 May 2013 13:50:36 +0000 (16:50 +0300)]
img2dec: Add ts_from_file option

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/blend: support slice threading
Paul B Mahol [Fri, 24 May 2013 18:14:54 +0000 (18:14 +0000)]
lavfi/blend: support slice threading

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agovf_fade: remove unused function
Michael Niedermayer [Fri, 24 May 2013 18:50:15 +0000 (20:50 +0200)]
vf_fade: remove unused function

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec: remove ff_get_logical_cpus()
Michael Niedermayer [Fri, 24 May 2013 18:24:29 +0000 (20:24 +0200)]
avcodec: remove ff_get_logical_cpus()

This simplifies the code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_fade: Support slice threaded alpha
Michael Niedermayer [Fri, 24 May 2013 18:02:34 +0000 (20:02 +0200)]
vf_fade: Support slice threaded alpha

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_fade: Fix alpha flag integration
Michael Niedermayer [Fri, 24 May 2013 17:55:33 +0000 (19:55 +0200)]
vf_fade: Fix alpha flag integration

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/blend: fix SW/SH calculation
Paul B Mahol [Fri, 24 May 2013 17:34:22 +0000 (17:34 +0000)]
lavfi/blend: fix SW/SH calculation

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agofade: fix slice sizes
Michael Niedermayer [Fri, 24 May 2013 15:34:36 +0000 (17:34 +0200)]
fade: fix slice sizes

This more evenly distributes the load between threads

This also fixes the chroma filtering where the filter was applied twice

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoyadif: fix slice sizes
Michael Niedermayer [Fri, 24 May 2013 15:33:59 +0000 (17:33 +0200)]
yadif: fix slice sizes

This more evenly distributes the load between threads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter/vf_yadif: fix race condition
Michael Niedermayer [Fri, 24 May 2013 15:12:58 +0000 (17:12 +0200)]
avfilter/vf_yadif: fix race condition

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 24 May 2013 15:14:25 +0000 (17:14 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cpu: Include common.h for av_popcount64

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoframemd5_class and md5enc_class may not be identical.
Reimar Döffinger [Fri, 24 May 2013 12:24:46 +0000 (14:24 +0200)]
framemd5_class and md5enc_class may not be identical.

Due the crappy issue of classes having to be unique,
we cannot even have classes with identical content,
otherwise the compiler or linker is free to merge them,
giving the same result and bugs as if we had only one class.
Besides redesigning the option code to handle this correctly
I see only the option of requiring any two classes to have
different names, but the list of requirements for
AVClasses is getting kind of unmanageable.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
7 years agoFix compilation with --disable-everything --enable-filter=dctdnoiz
Carl Eugen Hoyos [Fri, 24 May 2013 13:52:57 +0000 (15:52 +0200)]
Fix compilation with --disable-everything --enable-filter=dctdnoiz

7 years agoFix compilation with --disable-everything --enable-muxer=vc1
Thilo Borgmann [Fri, 24 May 2013 14:00:18 +0000 (16:00 +0200)]
Fix compilation with --disable-everything --enable-muxer=vc1

Suggested-by: Reimar
7 years agolavfi/blend: add yuv(j)411p
Paul B Mahol [Fri, 24 May 2013 14:01:14 +0000 (14:01 +0000)]
lavfi/blend: add yuv(j)411p

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agovformat/wtvenc: fix doxygen comments
Michael Niedermayer [Thu, 23 May 2013 13:52:33 +0000 (15:52 +0200)]
vformat/wtvenc: fix doxygen comments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/wtvdec: fix doxygen comments
Michael Niedermayer [Thu, 23 May 2013 13:52:07 +0000 (15:52 +0200)]
avformat/wtvdec: fix doxygen comments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/jvdec: fix doxygen comments
Michael Niedermayer [Thu, 23 May 2013 13:51:43 +0000 (15:51 +0200)]
avformat/jvdec: fix doxygen comments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavformat/gif: remove unneeded doxygen comment
Michael Niedermayer [Thu, 23 May 2013 13:51:11 +0000 (15:51 +0200)]
avformat/gif: remove unneeded doxygen comment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter/vf_drawtext: Fix doxygen comment
Michael Niedermayer [Thu, 23 May 2013 13:50:39 +0000 (15:50 +0200)]
avfilter/vf_drawtext: Fix doxygen comment

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavutil/bprint: Fix doxygen comments
Michael Niedermayer [Thu, 23 May 2013 13:47:32 +0000 (15:47 +0200)]
avutil/bprint: Fix doxygen comments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocmdutils: print slice threading flag in -filters.
Clément Bœsch [Fri, 24 May 2013 13:15:49 +0000 (15:15 +0200)]
cmdutils: print slice threading flag in -filters.

7 years agoavfilter: remove av_opt_set_defaults() from process_options()
Michael Niedermayer [Fri, 24 May 2013 13:06:53 +0000 (15:06 +0200)]
avfilter: remove av_opt_set_defaults() from process_options()

This is already called from ff_filter_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 24 May 2013 12:38:29 +0000 (14:38 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_fade: support slice threading
  vf_yadif: support slice threading

Conflicts:
libavfilter/vf_fade.c
libavfilter/vf_yadif.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/field, il, noise: use av_pix_fmt_count_planes()
Paul B Mahol [Fri, 24 May 2013 12:53:23 +0000 (12:53 +0000)]
lavfi/field, il, noise: use av_pix_fmt_count_planes()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f'
Michael Niedermayer [Fri, 24 May 2013 11:47:45 +0000 (13:47 +0200)]
Merge commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f'

* commit '129bb238430ec45a3b5f8f1d384df590ddf7b62f':
  lavfi: add a slice threading infrastructure

Conflicts:
Changelog
cmdutils.c
doc/APIchanges
libavfilter/Makefile
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/internal.h
libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675'
Michael Niedermayer [Fri, 24 May 2013 11:13:03 +0000 (13:13 +0200)]
Merge commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675'

* commit '2a6eaeaa85d17b27ee0dd449183ec197c35c9675':
  Move get_logical_cpus() from lavc/pthread to lavu/cpu.

Conflicts:
doc/APIchanges
libavcodec/pthread.c
libavutil/cpu.c
libavutil/cpu.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'
Michael Niedermayer [Fri, 24 May 2013 10:32:18 +0000 (12:32 +0200)]
Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'

* commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d':
  w32pthreads: move from lavc to compat/

Conflicts:
libavcodec/Makefile
libavcodec/pthread.c
libavcodec/vp8.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocpu: Include common.h for av_popcount64
Martin Storsjö [Fri, 24 May 2013 09:24:27 +0000 (12:24 +0300)]
cpu: Include common.h for av_popcount64

This fixes build failures on windows since 2a6eaeaa8.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoMerge commit 'e69222c50755030eef921e899e38b71a111093d9'
Michael Niedermayer [Fri, 24 May 2013 10:24:53 +0000 (12:24 +0200)]
Merge commit 'e69222c50755030eef921e899e38b71a111093d9'

* commit 'e69222c50755030eef921e899e38b71a111093d9':
  doxy: enable TYPEDEF_HIDES_STRUCT

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68'
Michael Niedermayer [Fri, 24 May 2013 10:04:18 +0000 (12:04 +0200)]
Merge commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68'

* commit 'e9e5a1bdc769a7225ab0d4f8b33bcacc6496bd68':
  Monkey's Audio old versions FATE tests
  h264_parser: Set field_order and picture_structure.

Conflicts:
libavcodec/h264_parser.c
tests/fate/lossless-audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu/opencl: remove semi-colon from macro.
Clément Bœsch [Fri, 24 May 2013 09:10:22 +0000 (11:10 +0200)]
lavu/opencl: remove semi-colon from macro.

Fixes compilation when the macros are empty and the label above ends up
containing no statement. Also makes usage of these macro consistent
(some already have a semi colon, some others don't).

Fixes Ticket #2603

7 years agoMerge commit 'b493847df4ff8ce46f258749e4a3f304696b34c1'
Michael Niedermayer [Fri, 24 May 2013 09:51:58 +0000 (11:51 +0200)]
Merge commit 'b493847df4ff8ce46f258749e4a3f304696b34c1'

* commit 'b493847df4ff8ce46f258749e4a3f304696b34c1':
  avcodec: Add picture structure information to AVCodecParserContext.

Conflicts:
doc/APIchanges
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_fade: support slice threading
Anton Khirnov [Sat, 11 May 2013 19:40:28 +0000 (21:40 +0200)]
vf_fade: support slice threading

7 years agovf_yadif: support slice threading
Anton Khirnov [Sat, 11 May 2013 19:40:28 +0000 (21:40 +0200)]
vf_yadif: support slice threading

7 years agolavfi: add a slice threading infrastructure
Anton Khirnov [Sat, 11 May 2013 18:41:46 +0000 (20:41 +0200)]
lavfi: add a slice threading infrastructure

Mostly based on libavcodec's

7 years agoMove get_logical_cpus() from lavc/pthread to lavu/cpu.
Anton Khirnov [Thu, 23 May 2013 06:59:07 +0000 (08:59 +0200)]
Move get_logical_cpus() from lavc/pthread to lavu/cpu.

It will be useful in lavfi, and could conceivably be useful to the user
applications as well.

7 years agow32pthreads: move from lavc to compat/
Anton Khirnov [Sun, 12 May 2013 06:11:42 +0000 (08:11 +0200)]
w32pthreads: move from lavc to compat/

It will be used in other places than lavc.

7 years agodoxy: enable TYPEDEF_HIDES_STRUCT
Anton Khirnov [Sun, 12 May 2013 12:58:14 +0000 (14:58 +0200)]
doxy: enable TYPEDEF_HIDES_STRUCT

This means that typedef struct SomeStruct {...} SomeStruct will only be
documented as SomeStruct in the doxy, without a pointless entry in the
typedefs list.

7 years agoMonkey's Audio old versions FATE tests
Kostya Shishkov [Fri, 3 May 2013 08:13:00 +0000 (10:13 +0200)]
Monkey's Audio old versions FATE tests

7 years agoh264_parser: Set field_order and picture_structure.
Yusuke Nakamura [Tue, 14 May 2013 22:37:36 +0000 (07:37 +0900)]
h264_parser: Set field_order and picture_structure.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoavcodec: Add picture structure information to AVCodecParserContext.
Yusuke Nakamura [Tue, 14 May 2013 22:36:15 +0000 (07:36 +0900)]
avcodec: Add picture structure information to AVCodecParserContext.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoChangelog: add entry for the S302m encoder
Michael Niedermayer [Fri, 24 May 2013 02:20:54 +0000 (04:20 +0200)]
Changelog: add entry for the S302m encoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agos302menc: unbreak compilation
Paul B Mahol [Thu, 23 May 2013 20:38:53 +0000 (20:38 +0000)]
s302menc: unbreak compilation

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agos302menc: fix bits_per_raw_sample for 21, 22 & 23 case
Paul B Mahol [Thu, 23 May 2013 20:34:07 +0000 (20:34 +0000)]
s302menc: fix bits_per_raw_sample for 21, 22 & 23 case

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavc/codec_desc: SMPTE 302M is not lossy
Paul B Mahol [Thu, 23 May 2013 20:25:19 +0000 (20:25 +0000)]
lavc/codec_desc: SMPTE 302M is not lossy

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoescape124: switch to init_get_bits8()
Paul B Mahol [Thu, 23 May 2013 19:56:43 +0000 (19:56 +0000)]
escape124: switch to init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoescape124: pass context to av_log()
Paul B Mahol [Thu, 23 May 2013 19:53:08 +0000 (19:53 +0000)]
escape124: pass context to av_log()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolibaacplus: return meaningful error codes
Paul B Mahol [Thu, 23 May 2013 19:40:15 +0000 (19:40 +0000)]
libaacplus: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolibaacplus: cosmetics: fix indentation
Paul B Mahol [Thu, 23 May 2013 19:37:52 +0000 (19:37 +0000)]
libaacplus: cosmetics: fix indentation

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolibaacplus: move profile check above, simplifies code a little
Paul B Mahol [Thu, 23 May 2013 19:34:39 +0000 (19:34 +0000)]
libaacplus: move profile check above, simplifies code a little

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agotools/patcheck: fix misdetection with stuff like const_names
Michael Niedermayer [Thu, 23 May 2013 14:00:10 +0000 (16:00 +0200)]
tools/patcheck: fix misdetection with stuff like const_names

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/filters: fix wording of color option in testsrc filters.
Clément Bœsch [Thu, 23 May 2013 12:01:51 +0000 (14:01 +0200)]
doc/filters: fix wording of color option in testsrc filters.