ffmpeg.git
6 years agoMerge commit '38675229a879aa5258a8c71891fc8cbf74cf139f'
Michael Niedermayer [Fri, 14 Mar 2014 00:01:37 +0000 (01:01 +0100)]
Merge commit '38675229a879aa5258a8c71891fc8cbf74cf139f'

* commit '38675229a879aa5258a8c71891fc8cbf74cf139f':
  dsputil_mmx: K&R formatting cosmetics

Conflicts:
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6a8b35dc88b4a1a452f192fbbf53ae7f59bc3f23'
Michael Niedermayer [Thu, 13 Mar 2014 23:57:21 +0000 (00:57 +0100)]
Merge commit '6a8b35dc88b4a1a452f192fbbf53ae7f59bc3f23'

* commit '6a8b35dc88b4a1a452f192fbbf53ae7f59bc3f23':
  dsputilenc_mmx: Merge two assignment blocks with identical conditions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '945673f792eb4141860ed66664156df685f7b7f0'
Michael Niedermayer [Thu, 13 Mar 2014 23:52:07 +0000 (00:52 +0100)]
Merge commit '945673f792eb4141860ed66664156df685f7b7f0'

* commit '945673f792eb4141860ed66664156df685f7b7f0':
  dsputil_template: K&R formatting cosmetics

Conflicts:
libavcodec/dsputil_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'acd2b8e42df25d46440583f93c12e5f285aebb31'
Michael Niedermayer [Thu, 13 Mar 2014 23:45:22 +0000 (00:45 +0100)]
Merge commit 'acd2b8e42df25d46440583f93c12e5f285aebb31'

* commit 'acd2b8e42df25d46440583f93c12e5f285aebb31':
  rnd_avg.h: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '05563ccacc98fd185affdbf8cbaf094caf36b852'
Michael Niedermayer [Thu, 13 Mar 2014 23:38:47 +0000 (00:38 +0100)]
Merge commit '05563ccacc98fd185affdbf8cbaf094caf36b852'

* commit '05563ccacc98fd185affdbf8cbaf094caf36b852':
  dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl names

Conflicts:
libavcodec/bit_depth_template.c
libavcodec/motionpixels_tablegen.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '635ec127d4bc0c49ae0ac4a50acd3da1ca8c2150'
Michael Niedermayer [Thu, 13 Mar 2014 23:37:28 +0000 (00:37 +0100)]
Merge commit '635ec127d4bc0c49ae0ac4a50acd3da1ca8c2150'

* commit '635ec127d4bc0c49ae0ac4a50acd3da1ca8c2150':
  dsputil: Merge variable declarations and initializations

Conflicts:
libavcodec/dsputil_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'bb12c2e9c00e3d3c393885849b8fa31cd849dc92'
Michael Niedermayer [Thu, 13 Mar 2014 23:31:48 +0000 (00:31 +0100)]
Merge commit 'bb12c2e9c00e3d3c393885849b8fa31cd849dc92'

* commit 'bb12c2e9c00e3d3c393885849b8fa31cd849dc92':
  dsputil: K&R formatting cosmetics

Conflicts:
libavcodec/dsputil.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '503dda7d4f5b4d76eed0239e9da66993a182b009'
Michael Niedermayer [Thu, 13 Mar 2014 23:18:38 +0000 (00:18 +0100)]
Merge commit '503dda7d4f5b4d76eed0239e9da66993a182b009'

* commit '503dda7d4f5b4d76eed0239e9da66993a182b009':
  dsputil.h: K&R formatting cosmetics

Conflicts:
libavcodec/dsputil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8199bb7be0db423bcbbd252d092386634fcf1d68'
Michael Niedermayer [Thu, 13 Mar 2014 23:10:31 +0000 (00:10 +0100)]
Merge commit '8199bb7be0db423bcbbd252d092386634fcf1d68'

* commit '8199bb7be0db423bcbbd252d092386634fcf1d68':
  dsputil.h: Clean up comments

Conflicts:
libavcodec/dsputil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0a8f91b1fbc1b627d8db8c734c812beb32102936'
Michael Niedermayer [Thu, 13 Mar 2014 23:07:42 +0000 (00:07 +0100)]
Merge commit '0a8f91b1fbc1b627d8db8c734c812beb32102936'

* commit '0a8f91b1fbc1b627d8db8c734c812beb32102936':
  dsputil: Remove disabled avg_no_rnd_qpel leftovers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '55519926ef855c671d084ccc151056de9e3d3a77'
Michael Niedermayer [Thu, 13 Mar 2014 23:01:30 +0000 (00:01 +0100)]
Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

* commit '55519926ef855c671d084ccc151056de9e3d3a77':
  x86: Make function prototype comments in assembly code consistent

Conflicts:
libavcodec/x86/sbrdsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'edd1f833fa145eb9c5026877c699ebe6efca00a0'
Michael Niedermayer [Thu, 13 Mar 2014 23:00:12 +0000 (00:00 +0100)]
Merge commit 'edd1f833fa145eb9c5026877c699ebe6efca00a0'

* commit 'edd1f833fa145eb9c5026877c699ebe6efca00a0':
  x86: h264_idct_10_bit: Use proper type in function prototype comments

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '831a1180785a786272cdcefb71566a770bfb879e'
Michael Niedermayer [Thu, 13 Mar 2014 22:59:56 +0000 (23:59 +0100)]
Merge commit '831a1180785a786272cdcefb71566a770bfb879e'

* commit '831a1180785a786272cdcefb71566a770bfb879e':
  Update dsputil- and SIMD-related comments to match reality more closely

Conflicts:
libavcodec/x86/hpeldsp.asm
libavutil/arm/float_dsp_init_arm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd1184b8110b4847013bf25222e6809eb3462913c'
Michael Niedermayer [Thu, 13 Mar 2014 22:41:36 +0000 (23:41 +0100)]
Merge commit 'd1184b8110b4847013bf25222e6809eb3462913c'

* commit 'd1184b8110b4847013bf25222e6809eb3462913c':
  arm: dsputil: Add a bunch of missing #includes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '17608f6ee3d2088cdb8d1e704276d8b34f01160d'
Michael Niedermayer [Thu, 13 Mar 2014 22:41:12 +0000 (23:41 +0100)]
Merge commit '17608f6ee3d2088cdb8d1e704276d8b34f01160d'

* commit '17608f6ee3d2088cdb8d1e704276d8b34f01160d':
  x86: Add some more missing headers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fd9e2221bd3b2c5d62605134b62efa26eb9ef0f7'
Michael Niedermayer [Thu, 13 Mar 2014 22:40:51 +0000 (23:40 +0100)]
Merge commit 'fd9e2221bd3b2c5d62605134b62efa26eb9ef0f7'

* commit 'fd9e2221bd3b2c5d62605134b62efa26eb9ef0f7':
  ppc: Add some missing headers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ed9625eb62be1e1c44cecdd73ea0d80077a15d48'
Michael Niedermayer [Thu, 13 Mar 2014 22:25:21 +0000 (23:25 +0100)]
Merge commit 'ed9625eb62be1e1c44cecdd73ea0d80077a15d48'

* commit 'ed9625eb62be1e1c44cecdd73ea0d80077a15d48':
  dsputil: Move intreadwrite.h #include from header file to .c files

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9103185bd116930f90b847090e66a64fa9971ce2'
Michael Niedermayer [Thu, 13 Mar 2014 22:07:17 +0000 (23:07 +0100)]
Merge commit '9103185bd116930f90b847090e66a64fa9971ce2'

* commit '9103185bd116930f90b847090e66a64fa9971ce2':
  dsputil: Drop ff_check_alignment() function

Conflicts:
libavcodec/dsputil.c

Not merged, as this check can safe the user and us some time
debuging misalignment issues.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '49676eb7301e775d08bdbba5380159b106ee258f'
Michael Niedermayer [Thu, 13 Mar 2014 21:55:33 +0000 (22:55 +0100)]
Merge commit '49676eb7301e775d08bdbba5380159b106ee258f'

* commit '49676eb7301e775d08bdbba5380159b106ee258f':
  dsputil: Remove prototypes for nonexisting optimization functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '08dba0e1c3df3b71270ebce4527bffa155b91b97'
Michael Niedermayer [Thu, 13 Mar 2014 21:38:04 +0000 (22:38 +0100)]
Merge commit '08dba0e1c3df3b71270ebce4527bffa155b91b97'

* commit '08dba0e1c3df3b71270ebce4527bffa155b91b97':
  x86: mpegvideoenc: Remove some remnants of the long-gone libmpeg2 IDCT

Not merged as the removed code is still used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/sparc: add note about the removial
Michael Niedermayer [Thu, 13 Mar 2014 21:37:38 +0000 (22:37 +0100)]
avcodec/sparc: add note about the removial

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'
Michael Niedermayer [Thu, 13 Mar 2014 21:27:17 +0000 (22:27 +0100)]
Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'

* commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143':
  Remove all SPARC architecture optimizations

Conflicts:
Makefile
configure
libavcodec/sparc/dsputil_vis.c
libavcodec/sparc/dsputil_vis.h
libavcodec/sparc/hpeldsp_vis.c
libavcodec/sparc/simple_idct_vis.c
libavcodec/sparc/vis.h
libswscale/sparc/yuv2rgb_vis.c
libswscale/swscale_internal.h

If someone wants to maintain these (or other) SPARC optimizations, please
contact me or ffmpeg-devel.
I am happy to revert this removial if theres someone considering to
maintain this code.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavcodec/sh4: add note about the removial
Michael Niedermayer [Thu, 13 Mar 2014 21:17:52 +0000 (22:17 +0100)]
libavcodec/sh4: add note about the removial

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd6096a67422534918405abb46dafbbac4608cbc3'
Michael Niedermayer [Thu, 13 Mar 2014 20:59:38 +0000 (21:59 +0100)]
Merge commit 'd6096a67422534918405abb46dafbbac4608cbc3'

* commit 'd6096a67422534918405abb46dafbbac4608cbc3':
  Remove all SH4 architecture optimizations

Conflicts:
libavcodec/sh4/dsputil_sh4.c
libavcodec/sh4/dsputil_sh4.h
libavcodec/sh4/idct_sh4.c
libavcodec/sh4/sh4.h

If someone wants to maintain these (or other) SH4 optimizations, please
contact me or ffmpeg-devel.
I am happy to revert this removial if theres someone considering to
maintain this code.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'bbb64356cca65d7a2a33f59b2267ee58f28a061a'
Michael Niedermayer [Thu, 13 Mar 2014 20:40:41 +0000 (21:40 +0100)]
Merge commit 'bbb64356cca65d7a2a33f59b2267ee58f28a061a'

* commit 'bbb64356cca65d7a2a33f59b2267ee58f28a061a':
  build: Record dependency of eatqi decoder on dsputil

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b5f112d820934ade66e809ef30bfcfc8210929f8'
Michael Niedermayer [Thu, 13 Mar 2014 20:35:56 +0000 (21:35 +0100)]
Merge commit 'b5f112d820934ade66e809ef30bfcfc8210929f8'

* commit 'b5f112d820934ade66e809ef30bfcfc8210929f8':
  configure: Add explicit dsputil dependency to mpegvideoenc

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'cd832f032f945a57a1f1dd385942c2fadc7ce4e5'
Michael Niedermayer [Thu, 13 Mar 2014 20:26:49 +0000 (21:26 +0100)]
Merge commit 'cd832f032f945a57a1f1dd385942c2fadc7ce4e5'

* commit 'cd832f032f945a57a1f1dd385942c2fadc7ce4e5':
  ffv1: Drop bogus dependency on dsputil

Conflicts:
configure
libavcodec/ffv1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0e29c5e1285eeb5b4842d96d00dfe06898cd87e5'
Michael Niedermayer [Thu, 13 Mar 2014 20:23:42 +0000 (21:23 +0100)]
Merge commit '0e29c5e1285eeb5b4842d96d00dfe06898cd87e5'

* commit '0e29c5e1285eeb5b4842d96d00dfe06898cd87e5':
  build: Drop stray LPC dependency on dsputil

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6cd76e5412d794dbd1cc6ab0e4c9f2ee53cf028f'
Michael Niedermayer [Thu, 13 Mar 2014 20:17:46 +0000 (21:17 +0100)]
Merge commit '6cd76e5412d794dbd1cc6ab0e4c9f2ee53cf028f'

* commit '6cd76e5412d794dbd1cc6ab0e4c9f2ee53cf028f':
  build: Drop stray MJPEG encoder dependency on dsputil

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9ecf1b62f37ef9cbdf2d7300a052cd704c4ba731'
Michael Niedermayer [Thu, 13 Mar 2014 20:16:02 +0000 (21:16 +0100)]
Merge commit '9ecf1b62f37ef9cbdf2d7300a052cd704c4ba731'

* commit '9ecf1b62f37ef9cbdf2d7300a052cd704c4ba731':
  build: Drop stray MLP decoder dependency on dsputil

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7d7be44f3e8bc14224540a477ef0607f18964421'
Michael Niedermayer [Thu, 13 Mar 2014 20:10:30 +0000 (21:10 +0100)]
Merge commit '7d7be44f3e8bc14224540a477ef0607f18964421'

* commit '7d7be44f3e8bc14224540a477ef0607f18964421':
  build: Drop stray PNG decoder dependency on dsputil

Conflicts:
configure

No change as the stray dependency was not in our configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '88b240646f57a62299c6c4c4d7554f0a80c3a29a'
Michael Niedermayer [Thu, 13 Mar 2014 20:06:30 +0000 (21:06 +0100)]
Merge commit '88b240646f57a62299c6c4c4d7554f0a80c3a29a'

* commit '88b240646f57a62299c6c4c4d7554f0a80c3a29a':
  build: Drop stray mpc8 decoder dependency on dsputil

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fb9a5bdc516b75b4ba1e36ca2223dec46571dea3'
Michael Niedermayer [Thu, 13 Mar 2014 20:01:14 +0000 (21:01 +0100)]
Merge commit 'fb9a5bdc516b75b4ba1e36ca2223dec46571dea3'

* commit 'fb9a5bdc516b75b4ba1e36ca2223dec46571dea3':
  Prepare for 11_alpha1 Release

Conflicts:
RELEASE

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/timestamp: Warn about missing __STDC_FORMAT_MACROS for C++ use
Michael Niedermayer [Thu, 13 Mar 2014 16:32:15 +0000 (17:32 +0100)]
avutil/timestamp: Warn about missing __STDC_FORMAT_MACROS for C++ use

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodsputil_mmx: K&R formatting cosmetics
Diego Biurrun [Wed, 25 Dec 2013 14:49:31 +0000 (15:49 +0100)]
dsputil_mmx: K&R formatting cosmetics

6 years agodsputilenc_mmx: Merge two assignment blocks with identical conditions
Diego Biurrun [Wed, 25 Dec 2013 15:49:23 +0000 (16:49 +0100)]
dsputilenc_mmx: Merge two assignment blocks with identical conditions

6 years agodsputil_template: K&R formatting cosmetics
Diego Biurrun [Sat, 21 Dec 2013 11:24:12 +0000 (12:24 +0100)]
dsputil_template: K&R formatting cosmetics

6 years agornd_avg.h: K&R formatting cosmetics
Diego Biurrun [Sat, 21 Dec 2013 16:10:22 +0000 (17:10 +0100)]
rnd_avg.h: K&R formatting cosmetics

6 years agodsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl names
Diego Biurrun [Sun, 22 Dec 2013 13:32:11 +0000 (14:32 +0100)]
dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl names

Also switch from "tbl" to "tab" name suffixes.

6 years agodsputil: Merge variable declarations and initializations
Diego Biurrun [Fri, 20 Dec 2013 12:58:18 +0000 (13:58 +0100)]
dsputil: Merge variable declarations and initializations

6 years agodsputil: K&R formatting cosmetics
Diego Biurrun [Thu, 19 Dec 2013 17:28:50 +0000 (18:28 +0100)]
dsputil: K&R formatting cosmetics

6 years agodsputil.h: K&R formatting cosmetics
Diego Biurrun [Sun, 22 Dec 2013 16:50:07 +0000 (17:50 +0100)]
dsputil.h: K&R formatting cosmetics

6 years agodsputil.h: Clean up comments
Diego Biurrun [Sun, 22 Dec 2013 16:49:52 +0000 (17:49 +0100)]
dsputil.h: Clean up comments

6 years agodsputil: Remove disabled avg_no_rnd_qpel leftovers
Diego Biurrun [Tue, 7 Jan 2014 22:51:08 +0000 (23:51 +0100)]
dsputil: Remove disabled avg_no_rnd_qpel leftovers

6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Thu, 13 Mar 2014 14:00:49 +0000 (15:00 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix hardware detection on aix.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 13 Mar 2014 13:16:00 +0000 (14:16 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: Match stream id

Conflicts:
cmdutils.c
doc/fftools-common-opts.texi

See: ea07063fd82686af3fabb45e5ed10aa48d084d61
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: Make function prototype comments in assembly code consistent
Diego Biurrun [Tue, 28 Jan 2014 19:35:58 +0000 (20:35 +0100)]
x86: Make function prototype comments in assembly code consistent

This helps grepping for functions, among other things.

6 years agox86: h264_idct_10_bit: Use proper type in function prototype comments
Diego Biurrun [Wed, 18 Dec 2013 20:12:02 +0000 (21:12 +0100)]
x86: h264_idct_10_bit: Use proper type in function prototype comments

6 years agoUpdate dsputil- and SIMD-related comments to match reality more closely
Diego Biurrun [Wed, 29 Jan 2014 12:12:59 +0000 (13:12 +0100)]
Update dsputil- and SIMD-related comments to match reality more closely

6 years agoarm: dsputil: Add a bunch of missing #includes
Diego Biurrun [Wed, 12 Feb 2014 20:28:44 +0000 (21:28 +0100)]
arm: dsputil: Add a bunch of missing #includes

6 years agox86: Add some more missing headers
Diego Biurrun [Wed, 29 Jan 2014 12:07:57 +0000 (13:07 +0100)]
x86: Add some more missing headers

6 years agoppc: Add some missing headers
Diego Biurrun [Fri, 17 Jan 2014 16:38:05 +0000 (08:38 -0800)]
ppc: Add some missing headers

6 years agodsputil: Move intreadwrite.h #include from header file to .c files
Diego Biurrun [Mon, 10 Feb 2014 17:58:28 +0000 (18:58 +0100)]
dsputil: Move intreadwrite.h #include from header file to .c files

6 years agodsputil: Drop ff_check_alignment() function
Diego Biurrun [Mon, 27 Jan 2014 17:37:40 +0000 (18:37 +0100)]
dsputil: Drop ff_check_alignment() function

The function is supposed to confirm that the compiler provided enough
alignment, but in practice it is only run in certain code paths and
insufficient alignment problems are restricted to legacy compilers.

6 years agodsputil: Remove prototypes for nonexisting optimization functions
Diego Biurrun [Tue, 7 Jan 2014 11:59:44 +0000 (12:59 +0100)]
dsputil: Remove prototypes for nonexisting optimization functions

6 years agox86: mpegvideoenc: Remove some remnants of the long-gone libmpeg2 IDCT
Diego Biurrun [Thu, 23 Jan 2014 16:23:02 +0000 (17:23 +0100)]
x86: mpegvideoenc: Remove some remnants of the long-gone libmpeg2 IDCT

6 years agoRemove all SPARC architecture optimizations
Diego Biurrun [Tue, 7 Jan 2014 10:00:46 +0000 (11:00 +0100)]
Remove all SPARC architecture optimizations

SPARC is no longer being used in any multimedia-related fields and the
VIS optimizations only represent a maintenance burden.

6 years agoRemove all SH4 architecture optimizations
Diego Biurrun [Tue, 7 Jan 2014 09:29:11 +0000 (10:29 +0100)]
Remove all SH4 architecture optimizations

SH4 has been end-of-lifed and no more test machines are available.

6 years agobuild: Record dependency of eatqi decoder on dsputil
Diego Biurrun [Wed, 29 Jan 2014 16:25:38 +0000 (17:25 +0100)]
build: Record dependency of eatqi decoder on dsputil

6 years agoconfigure: Add explicit dsputil dependency to mpegvideoenc
Diego Biurrun [Fri, 7 Feb 2014 12:15:47 +0000 (13:15 +0100)]
configure: Add explicit dsputil dependency to mpegvideoenc

Previously, it was an implicit dependency through mpegvideo. Change
this, as implicit dependencies can cause all sorts of trouble.

6 years agoffv1: Drop bogus dependency on dsputil
Diego Biurrun [Mon, 24 Feb 2014 14:01:16 +0000 (06:01 -0800)]
ffv1: Drop bogus dependency on dsputil

ffv1 does not use any part of the dsputil framework.

6 years agobuild: Drop stray LPC dependency on dsputil
Diego Biurrun [Mon, 27 Jan 2014 22:36:36 +0000 (23:36 +0100)]
build: Drop stray LPC dependency on dsputil

6 years agobuild: Drop stray MJPEG encoder dependency on dsputil
Diego Biurrun [Wed, 29 Jan 2014 14:19:20 +0000 (15:19 +0100)]
build: Drop stray MJPEG encoder dependency on dsputil

6 years agobuild: Drop stray MLP decoder dependency on dsputil
Diego Biurrun [Wed, 29 Jan 2014 14:17:05 +0000 (15:17 +0100)]
build: Drop stray MLP decoder dependency on dsputil

6 years agobuild: Drop stray PNG decoder dependency on dsputil
Diego Biurrun [Wed, 29 Jan 2014 14:10:41 +0000 (15:10 +0100)]
build: Drop stray PNG decoder dependency on dsputil

6 years agobuild: Drop stray mpc8 decoder dependency on dsputil
Diego Biurrun [Thu, 16 Jan 2014 23:53:40 +0000 (00:53 +0100)]
build: Drop stray mpc8 decoder dependency on dsputil

6 years agoPrepare for 11_alpha1 Release
Reinhard Tartler [Thu, 13 Mar 2014 12:22:26 +0000 (08:22 -0400)]
Prepare for 11_alpha1 Release

6 years agoavconv: Match stream id
Luca Barbato [Wed, 12 Mar 2014 17:01:48 +0000 (18:01 +0100)]
avconv: Match stream id

Quite useful to select by pid in MPEG-TS.

6 years agoFix hardware detection on aix.
Carl Eugen Hoyos [Thu, 13 Mar 2014 07:34:45 +0000 (08:34 +0100)]
Fix hardware detection on aix.

6 years agox86/float_dsp: add ff_vector_{fmul_add, fmac_scalar}_fma3
James Almer [Mon, 10 Mar 2014 20:09:20 +0000 (17:09 -0300)]
x86/float_dsp: add ff_vector_{fmul_add, fmac_scalar}_fma3

~7% faster than AVX

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/texi2pod: fix encoding type
Michael Niedermayer [Thu, 13 Mar 2014 02:06:08 +0000 (03:06 +0100)]
doc/texi2pod: fix encoding type

docs say:
'A document having more than one "=encoding" line should be considered an error. '

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomvformat/movenc: fix IMX
Michael Niedermayer [Mon, 27 Jan 2014 17:57:52 +0000 (18:57 +0100)]
mvformat/movenc: fix IMX

fixes Ticket3351

Tested-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 12 Mar 2014 22:22:37 +0000 (23:22 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  http: Properly initialize icy headers string

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/platform: mention that yuvis gas-preprocessor is currently missing some changes
Michael Niedermayer [Wed, 12 Mar 2014 22:08:41 +0000 (23:08 +0100)]
doc/platform: mention that yuvis gas-preprocessor is currently missing some changes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotools/build_libstagefright: switch git urls to https
Michael Niedermayer [Wed, 12 Mar 2014 22:07:00 +0000 (23:07 +0100)]
tools/build_libstagefright: switch git urls to https

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc: switch github urls to https
Michael Niedermayer [Wed, 12 Mar 2014 22:03:11 +0000 (23:03 +0100)]
doc: switch github urls to https

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd15c536123a44362ace6299c391a492c90b83fc7'
Michael Niedermayer [Wed, 12 Mar 2014 22:02:56 +0000 (23:02 +0100)]
Merge commit 'd15c536123a44362ace6299c391a492c90b83fc7'

* commit 'd15c536123a44362ace6299c391a492c90b83fc7':
  doc: Point to the correct, actually maintained gas-preprocessor repo

Conflicts:
doc/platform.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5a7f382a5d33d9a26890affe6c8c5070a48dfc22'
Michael Niedermayer [Wed, 12 Mar 2014 20:52:36 +0000 (21:52 +0100)]
Merge commit '5a7f382a5d33d9a26890affe6c8c5070a48dfc22'

* commit '5a7f382a5d33d9a26890affe6c8c5070a48dfc22':
  armv6: vp8: use explicit labels in motion compensation asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'aa807425395caa17a85ed2833133278e8bd44a76'
Michael Niedermayer [Wed, 12 Mar 2014 20:45:02 +0000 (21:45 +0100)]
Merge commit 'aa807425395caa17a85ed2833133278e8bd44a76'

* commit 'aa807425395caa17a85ed2833133278e8bd44a76':
  configure: Support older version of openjpeg1

Conflicts:
configure

Not merged as the problematic pkg config code wasnt merged

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b4e355c89e23664b8dac26936bf3fa7e7bc2110f'
Michael Niedermayer [Wed, 12 Mar 2014 20:35:48 +0000 (21:35 +0100)]
Merge commit 'b4e355c89e23664b8dac26936bf3fa7e7bc2110f'

* commit 'b4e355c89e23664b8dac26936bf3fa7e7bc2110f':
  copy_block: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b3c6ee199e75bbad2908253f11e871500dd38531'
Michael Niedermayer [Wed, 12 Mar 2014 20:05:00 +0000 (21:05 +0100)]
Merge commit 'b3c6ee199e75bbad2908253f11e871500dd38531'

* commit 'b3c6ee199e75bbad2908253f11e871500dd38531':
  configure: Group toolchain options together in help output

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e77a2ea9505863e50bf013706f66bf8b7325e524'
Michael Niedermayer [Wed, 12 Mar 2014 19:50:17 +0000 (20:50 +0100)]
Merge commit 'e77a2ea9505863e50bf013706f66bf8b7325e524'

* commit 'e77a2ea9505863e50bf013706f66bf8b7325e524':
  http: Declare more parameters as const where possible

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohttp: Properly initialize icy headers string
Alessandro Ghedini [Wed, 12 Mar 2014 15:28:22 +0000 (16:28 +0100)]
http: Properly initialize icy headers string

The icy_metadata_headers string never gets initialized, so,
during the first call to av_strlcatf() in parse_icy(),
strlen() will be called on a pointer to uninitialized memory.
At best this causes some garbage data to be left at the
start of the string.

By initializing icy_metadata_headers to the empty string, the
first call to strlen() will always return 0, so that data is
appended from the start of the string.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agodoc: Point to the correct, actually maintained gas-preprocessor repo
Martin Storsjö [Wed, 12 Mar 2014 11:46:04 +0000 (13:46 +0200)]
doc: Point to the correct, actually maintained gas-preprocessor repo

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoarmv6: vp8: use explicit labels in motion compensation asm
Janne Grunau [Mon, 10 Mar 2014 22:58:35 +0000 (23:58 +0100)]
armv6: vp8: use explicit labels in motion compensation asm

The integrated arm assembler in clang-503.0.38 (Xcode-5.1) fails
to assemble a branch to 'label + offset' in thumb mode.

6 years agoconfigure: Support older version of openjpeg1
Luca Barbato [Wed, 12 Mar 2014 09:30:07 +0000 (09:30 +0000)]
configure: Support older version of openjpeg1

It should work best for debian stable and people not installing the .pc
file.

6 years agocopy_block: K&R formatting cosmetics
Vittorio Giovara [Mon, 10 Mar 2014 20:44:26 +0000 (21:44 +0100)]
copy_block: K&R formatting cosmetics

6 years agoconfigure: Group toolchain options together in help output
Diego Biurrun [Tue, 11 Mar 2014 17:52:44 +0000 (18:52 +0100)]
configure: Group toolchain options together in help output

6 years agoupdate doc/APIchanges
Michael Niedermayer [Wed, 12 Mar 2014 12:51:09 +0000 (13:51 +0100)]
update doc/APIchanges

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat: extracting NTP timestamp from RTCP
Fred Rothganger [Tue, 11 Mar 2014 23:58:34 +0000 (17:58 -0600)]
avformat: extracting NTP timestamp from RTCP

For muxing, it accepts
both 0 and AV_NOPTS_VALUE. For demuxing, it will present
AV_NOPTS_VALUE when start_time_realtime is unknown.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/movenc: rescale when copying duration to timecode track
Bryce McLeod [Wed, 12 Mar 2014 11:52:27 +0000 (12:52 +0100)]
avformat/movenc: rescale when copying duration to timecode track

Fixes Ticket3453

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/general.texi: Adjust the notes on AviSynth
Stephen Hutchinson [Wed, 12 Mar 2014 03:02:16 +0000 (23:02 -0400)]
doc/general.texi: Adjust the notes on AviSynth

FFmpeg provides local copies of these headers in compat/avisynth/,
and there is no restriction against using 2.5.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohttp: Declare more parameters as const where possible
Martin Storsjö [Wed, 12 Mar 2014 07:40:05 +0000 (09:40 +0200)]
http: Declare more parameters as const where possible

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Wed, 12 Mar 2014 11:20:01 +0000 (12:20 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Revert "Allow stream-copying grayscale mov files."

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat: revert %c changes from d92024f18fa3d69937cb2575f3a8bf973df02430
Michael Niedermayer [Wed, 12 Mar 2014 04:05:01 +0000 (05:05 +0100)]
avformat: revert %c changes from d92024f18fa3d69937cb2575f3a8bf973df02430

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 12 Mar 2014 03:53:14 +0000 (04:53 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  http: Allow setting a Content-Type for POST requests

Conflicts:
libavformat/http.c

See: c01d1d4ddf4d8240427341af1c077f6455243576
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fe568b3d27ca2c5cca3878b2a7a3a968e605aec4'
Michael Niedermayer [Wed, 12 Mar 2014 03:41:48 +0000 (04:41 +0100)]
Merge commit 'fe568b3d27ca2c5cca3878b2a7a3a968e605aec4'

* commit 'fe568b3d27ca2c5cca3878b2a7a3a968e605aec4':
  http: Improve options descriptions

Conflicts:
doc/protocols.texi
libavformat/http.c

See: 255ec768da6f6e821775888621da2156764598da
See: 0a7cd740438b46e3b9fbf406ca5a948a6f027c97
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab'
Michael Niedermayer [Wed, 12 Mar 2014 03:29:54 +0000 (04:29 +0100)]
Merge commit 'ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab'

* commit 'ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab':
  http: Always allow no-op seek

Conflicts:
libavformat/http.c

See: 857841c1b63bf3ffacef03da2bd6275d55ead769
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2ec33d27127251bbc45e1f88e60691ad59cf2319'
Michael Niedermayer [Wed, 12 Mar 2014 03:12:04 +0000 (04:12 +0100)]
Merge commit '2ec33d27127251bbc45e1f88e60691ad59cf2319'

* commit '2ec33d27127251bbc45e1f88e60691ad59cf2319':
  http: Add support for selecting a request range

Conflicts:
doc/protocols.texi
libavformat/http.c

See: d52882faef368264f9fe5a595274ec84d3446132
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ddfc98906373d1f17f6205cedd14c68d7a75995f'
Michael Niedermayer [Wed, 12 Mar 2014 02:44:23 +0000 (03:44 +0100)]
Merge commit 'ddfc98906373d1f17f6205cedd14c68d7a75995f'

* commit 'ddfc98906373d1f17f6205cedd14c68d7a75995f':
  http: Support setting custom User-Agent

Conflicts:
doc/protocols.texi
libavformat/http.c

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