ffmpeg.git
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 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 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>
6 years agoMerge commit 'e58c85b0686892960042232e51c77168b264838a'
Michael Niedermayer [Wed, 12 Mar 2014 02:28:43 +0000 (03:28 +0100)]
Merge commit 'e58c85b0686892960042232e51c77168b264838a'

* commit 'e58c85b0686892960042232e51c77168b264838a':
  http: Export Content-Type information

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

See: 76d851b65619e5a0fe4cc5248a6858287fe890b4
See: 20899c54f03c413b225e8839a3c5318ab47abe55
See: 255ec768da6f6e821775888621da2156764598da
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab'
Michael Niedermayer [Wed, 12 Mar 2014 02:16:21 +0000 (03:16 +0100)]
Merge commit '8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab'

* commit '8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab':
  http: Add support reading ICY metadata

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

See: a92fbe16f2dc118c0d3adc222484268831388648
See: 636273d3d4a8c42f51832e8bf83e566e875916bf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4ff99ab3d7d5576e99e6b8a411b4a44500ed88fa'
Michael Niedermayer [Wed, 12 Mar 2014 01:52:17 +0000 (02:52 +0100)]
Merge commit '4ff99ab3d7d5576e99e6b8a411b4a44500ed88fa'

* commit '4ff99ab3d7d5576e99e6b8a411b4a44500ed88fa':
  http: Refactor process_line

Conflicts:
libavformat/http.c

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

* commit '7a2fddb4480121712df560cf619c1c3566cae3ff':
  http: K&R formatting cosmetics

Conflicts:
libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '78b21c1d7177e1d61ad3c9225f67699da089aa7c'
Michael Niedermayer [Wed, 12 Mar 2014 01:39:46 +0000 (02:39 +0100)]
Merge commit '78b21c1d7177e1d61ad3c9225f67699da089aa7c'

* commit '78b21c1d7177e1d61ad3c9225f67699da089aa7c':
  http: Drop doxy comments

Conflicts:
libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '55a215ba63d9fa79cd7ee265ee2e777ee86b200c'
Michael Niedermayer [Wed, 12 Mar 2014 01:33:27 +0000 (02:33 +0100)]
Merge commit '55a215ba63d9fa79cd7ee265ee2e777ee86b200c'

* commit '55a215ba63d9fa79cd7ee265ee2e777ee86b200c':
  http: Return meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '390acbea0697a60300f249602dbf701e04274693'
Michael Niedermayer [Wed, 12 Mar 2014 01:22:16 +0000 (02:22 +0100)]
Merge commit '390acbea0697a60300f249602dbf701e04274693'

* commit '390acbea0697a60300f249602dbf701e04274693':
  configure: Provide --pkg-config-flags

Conflicts:
configure

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

* commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf':
  avformat: Report the duration analysis reached

Conflicts:
libavformat/utils.c

See: 8529f9b36b7c1b8f2cb36ba2709983517c4b6458
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/flvdec: discard inconsistent timestamps
Michael Niedermayer [Wed, 12 Mar 2014 00:50:41 +0000 (01:50 +0100)]
avformat/flvdec: discard inconsistent timestamps

Fixes Ticket3425

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: display information on stream cycling
Michael Niedermayer [Tue, 11 Mar 2014 00:20:18 +0000 (01:20 +0100)]
ffplay: display information on stream cycling

Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohttp: Allow setting a Content-Type for POST requests
Clément Bœsch [Thu, 6 Mar 2014 17:40:03 +0000 (18:40 +0100)]
http: Allow setting a Content-Type for POST requests

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agohttp: Improve options descriptions
Alessandro Ghedini [Thu, 6 Mar 2014 17:40:02 +0000 (18:40 +0100)]
http: Improve options descriptions

Add documentation where missing.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agohttp: Always allow no-op seek
Anssi Hannula [Thu, 6 Mar 2014 17:40:01 +0000 (18:40 +0100)]
http: Always allow no-op seek

This also allows checking stream position as per ffurl_seek() doxy.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agohttp: Add support for selecting a request range
Anssi Hannula [Thu, 6 Mar 2014 17:40:00 +0000 (18:40 +0100)]
http: Add support for selecting a request range

Comment from Reimar Döffinger included as pro memoria.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agohttp: Support setting custom User-Agent
Clément Bœsch [Thu, 6 Mar 2014 17:39:59 +0000 (18:39 +0100)]
http: Support setting custom User-Agent

Contextually make the default User-Agent use the common
"Name/Version" pattern.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agohttp: Export Content-Type information
Michael Niedermayer [Thu, 6 Mar 2014 17:39:58 +0000 (18:39 +0100)]
http: Export Content-Type information

Bug-Id: https://bugs.debian.org/740421

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agohttp: Add support reading ICY metadata
Luca Barbato [Mon, 10 Mar 2014 20:11:35 +0000 (21:11 +0100)]
http: Add support reading ICY metadata

Export the metadata as a icy_metadata_packet avoption.
Based on the work of wm4 and Alessandro Ghedini.

Bug-Id: https://bugs.debian.org/739936

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agohttp: Refactor process_line
Luca Barbato [Mon, 10 Mar 2014 19:16:50 +0000 (20:16 +0100)]
http: Refactor process_line

6 years agohttp: K&R formatting cosmetics
Luca Barbato [Mon, 10 Mar 2014 17:02:09 +0000 (18:02 +0100)]
http: K&R formatting cosmetics

6 years agohttp: Drop doxy comments
Luca Barbato [Mon, 10 Mar 2014 16:53:51 +0000 (17:53 +0100)]
http: Drop doxy comments

6 years agohttp: Return meaningful error codes
Luca Barbato [Mon, 10 Mar 2014 16:17:25 +0000 (17:17 +0100)]
http: Return meaningful error codes

6 years agoconfigure: Provide --pkg-config-flags
Luca Barbato [Mon, 20 Jan 2014 10:17:45 +0000 (11:17 +0100)]
configure: Provide --pkg-config-flags

Should be used only to pass extra flags to pkgconf invocation,
e.g. --static.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoavformat: Report the duration analysis reached
Luca Barbato [Tue, 11 Mar 2014 12:41:18 +0000 (13:41 +0100)]
avformat: Report the duration analysis reached

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 11 Mar 2014 20:19:46 +0000 (21:19 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: Add section about AviSynth support

Conflicts:
doc/general.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5926603ad65e5fd4fefe8f0d72c381059f71cd59'
Michael Niedermayer [Tue, 11 Mar 2014 20:12:42 +0000 (21:12 +0100)]
Merge commit '5926603ad65e5fd4fefe8f0d72c381059f71cd59'

* commit '5926603ad65e5fd4fefe8f0d72c381059f71cd59':
  configure: Document --pkg-config option

Conflicts:
configure

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

* commit 'd92024f18fa3d69937cb2575f3a8bf973df02430':
  lavf: more correct printf format specifiers

Conflicts:
libavformat/asfdec.c
libavformat/cafdec.c
libavformat/dxa.c
libavformat/framecrcenc.c
libavformat/hnm.c
libavformat/iff.c
libavformat/mov.c
libavformat/mxfdec.c
libavformat/rmdec.c
libavformat/rpl.c
libavformat/smacker.c
libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vorbisdec: use the stored previous window type only when the actual previous...
Michael Niedermayer [Tue, 11 Mar 2014 19:45:29 +0000 (20:45 +0100)]
avcodec/vorbisdec: use the stored previous window type only when the actual previous is not known

Fixes Ticket3432

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc: Add section about AviSynth support
Stephen Hutchinson [Tue, 14 Jan 2014 14:49:29 +0000 (09:49 -0500)]
doc: Add section about AviSynth support

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoRevert "Allow stream-copying grayscale mov files."
Carl Eugen Hoyos [Tue, 11 Mar 2014 19:09:07 +0000 (20:09 +0100)]
Revert "Allow stream-copying grayscale mov files."

This reverts commit 691dec62011fe9993809fbc793126b40cac0c584.

The commit did not fix ticket #3215, it was fixed one commit earlier.
The revert may break other use-cases but they should be fixed differently,
the offending commit introduced too many problems.

Fixes ticket #3377.
Fixes ticket #3378.

6 years agoconfigure: Document --pkg-config option
Luca Barbato [Tue, 11 Mar 2014 18:12:05 +0000 (19:12 +0100)]
configure: Document --pkg-config option

6 years agoavformat/avidec: Check required demuxing buffer sizes in guess_ni_flag()
Michael Niedermayer [Tue, 11 Mar 2014 18:18:23 +0000 (19:18 +0100)]
avformat/avidec: Check required demuxing buffer sizes in guess_ni_flag()

Fixes Ticket3421

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavidec: calculate missing bitrates from index
Michael Niedermayer [Tue, 11 Mar 2014 18:04:45 +0000 (19:04 +0100)]
avidec: calculate missing bitrates from index

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Tue, 11 Mar 2014 12:57:52 +0000 (13:57 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Decode png images without iend chunk.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoDocumented av_dump_format
Anshul Maheshwari [Tue, 11 Mar 2014 06:26:28 +0000 (11:56 +0530)]
Documented av_dump_format

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix modplug linkage on Windows.
Matt Oliver [Tue, 11 Mar 2014 03:20:44 +0000 (14:20 +1100)]
Fix modplug linkage on Windows.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: more correct printf format specifiers
Diego Biurrun [Mon, 10 Mar 2014 14:35:59 +0000 (15:35 +0100)]
lavf: more correct printf format specifiers

6 years agoDecode png images without iend chunk.
Carl Eugen Hoyos [Tue, 11 Mar 2014 08:56:38 +0000 (09:56 +0100)]
Decode png images without iend chunk.

Fixes ticket #3357.

6 years agoavcodec/mjpegdec: support adob transform 2
Michael Niedermayer [Tue, 11 Mar 2014 03:20:23 +0000 (04:20 +0100)]
avcodec/mjpegdec: support adob transform 2

Fixes Ticket3426

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: make it possible to disable xlib dependancy
Michael Niedermayer [Wed, 19 Feb 2014 02:59:32 +0000 (03:59 +0100)]
configure: make it possible to disable xlib dependancy

The unconditional dependancy was added in 7671dd7cd7d51bbd637cc46d8f104a141bc355ea

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/APIchanges: fill in dates
Michael Niedermayer [Fri, 7 Mar 2014 01:59:10 +0000 (02:59 +0100)]
doc/APIchanges: fill in dates

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