ffmpeg.git
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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.

5 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.

5 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

5 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

5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 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>
5 years agohttp: Refactor process_line
Luca Barbato [Mon, 10 Mar 2014 19:16:50 +0000 (20:16 +0100)]
http: Refactor process_line

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

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

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

5 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>
5 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

5 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>
5 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>
5 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>
5 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>
5 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>
5 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.

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

5 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>
5 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>
5 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>
5 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>
5 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>
5 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

5 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.

5 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>
5 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>
5 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>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Mon, 10 Mar 2014 23:53:20 +0000 (00:53 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Define ff_log2_run[] in libavcodec/internal.h.
  Replace an incorrect av_free() in movenc.c with av_freep().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 10 Mar 2014 23:09:56 +0000 (00:09 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: miscellaneous cosmetics

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '77e9123fe5d64b0960158de6e1713d3c6c7878a7'
Michael Niedermayer [Mon, 10 Mar 2014 22:54:55 +0000 (23:54 +0100)]
Merge commit '77e9123fe5d64b0960158de6e1713d3c6c7878a7'

* commit '77e9123fe5d64b0960158de6e1713d3c6c7878a7':
  lavf: always use av_free

See: 88c8e4afeaf74ee58b67145e0331e229d8050968
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: miscellaneous cosmetics
Diego Biurrun [Sat, 2 Nov 2013 16:21:49 +0000 (17:21 +0100)]
configure: miscellaneous cosmetics

Sort lists of components. Add some whitespace where it helps readability.
Consistently use double instead of single quotes around component lists.

5 years agoMerge commit '34bbc81de8a49fbddb92b76dc733f40890480b2b'
Michael Niedermayer [Mon, 10 Mar 2014 22:38:01 +0000 (23:38 +0100)]
Merge commit '34bbc81de8a49fbddb92b76dc733f40890480b2b'

* commit '34bbc81de8a49fbddb92b76dc733f40890480b2b':
  lavf: simplify ff_hevc_annexb2mp4_buf

Conflicts:
libavformat/hevc.c
libavformat/hevc.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4a8562394b685e83ae4a38a93eef43625755a231'
Michael Niedermayer [Mon, 10 Mar 2014 22:00:55 +0000 (23:00 +0100)]
Merge commit '4a8562394b685e83ae4a38a93eef43625755a231'

* commit '4a8562394b685e83ae4a38a93eef43625755a231':
  configure: Use the right pkgconf file for openjpeg

Conflicts:
configure

No change as the incorrect code wasnt in ffmpegs configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'ee17be3fdd37f63f4b77676820e387858908b0f4'
Michael Niedermayer [Mon, 10 Mar 2014 21:51:38 +0000 (22:51 +0100)]
Merge commit 'ee17be3fdd37f63f4b77676820e387858908b0f4'

* commit 'ee17be3fdd37f63f4b77676820e387858908b0f4':
  hevc: Use get_se_golomb_long

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '5eacbb53289570834f9a1acb15fd406ea224eef6'
Michael Niedermayer [Mon, 10 Mar 2014 21:32:35 +0000 (22:32 +0100)]
Merge commit '5eacbb53289570834f9a1acb15fd406ea224eef6'

* commit '5eacbb53289570834f9a1acb15fd406ea224eef6':
  golomb: Add a get_se_golomb_long

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf: always use av_free
Michael Niedermayer [Mon, 10 Mar 2014 15:03:14 +0000 (15:03 +0000)]
lavf: always use av_free

Signed-off-by: Tim Walker <tdskywalker@gmail.com>
5 years agolavf: simplify ff_hevc_annexb2mp4_buf
Tim Walker [Mon, 10 Mar 2014 15:03:13 +0000 (15:03 +0000)]
lavf: simplify ff_hevc_annexb2mp4_buf

Use ff_hevc_annexb2mp4 instead of duplicating
its functionality, and update the documentation
to match the new behavior.

5 years agoDefine ff_log2_run[] in libavcodec/internal.h.
Carl Eugen Hoyos [Mon, 10 Mar 2014 12:37:12 +0000 (13:37 +0100)]
Define ff_log2_run[] in libavcodec/internal.h.

This avoids defining the array with different sizes in
different source files.

5 years agoReplace an incorrect av_free() in movenc.c with av_freep().
Carl Eugen Hoyos [Mon, 10 Mar 2014 12:30:51 +0000 (13:30 +0100)]
Replace an incorrect av_free() in movenc.c with av_freep().

5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 10 Mar 2014 11:03:29 +0000 (12:03 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Work around broken floating point limits on some systems.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8cafeb8bca5d079041739dbd72ccec0ead138eaf'
Michael Niedermayer [Mon, 10 Mar 2014 10:51:40 +0000 (11:51 +0100)]
Merge commit '8cafeb8bca5d079041739dbd72ccec0ead138eaf'

* commit '8cafeb8bca5d079041739dbd72ccec0ead138eaf':
  mxfdec: Validate parameters to strftime

Conflicts:
libavformat/mxfdec.c

See: 423089e964410adbf13af3de42e3c9dd5a1babd6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: Use the right pkgconf file for openjpeg
Luca Barbato [Mon, 10 Mar 2014 10:48:04 +0000 (11:48 +0100)]
configure: Use the right pkgconf file for openjpeg

The current release of version 1 uses libopenjpeg1.

5 years agohevc: Use get_se_golomb_long
Luca Barbato [Mon, 10 Mar 2014 09:59:48 +0000 (10:59 +0100)]
hevc: Use get_se_golomb_long

Do not use inline functions that refer to tables present in other
libraries.

5 years agogolomb: Add a get_se_golomb_long
Luca Barbato [Mon, 10 Mar 2014 09:57:51 +0000 (10:57 +0100)]
golomb: Add a get_se_golomb_long

Useful in libavformat mostly.

5 years agoWork around broken floating point limits on some systems.
Anton Khirnov [Thu, 14 Nov 2013 11:19:04 +0000 (12:19 +0100)]
Work around broken floating point limits on some systems.

The values of {FLT,DBL}_{MAX,MIN} macros on some systems (older musl
libc, some BSD flavours) are not exactly representable, i.e.
(double)DBL_MAX == DBL_MAX is false
This violates (at least some interpretations of) the C99 standard and
breaks code (e.g. in vf_fps) like
double f = DBL_MAX;
[...]
if (f == DBL_MAX) { // f has not been changed yet
    [....]
}

5 years agomxfdec: Validate parameters to strftime
Martin Storsjö [Sun, 9 Mar 2014 20:44:10 +0000 (22:44 +0200)]
mxfdec: Validate parameters to strftime

The MSVCRT version of strftime calls the invalid parameter handler
if the struct values in struct tm are invalid. In case no invalid
parameter handler is set for the process, the process is aborted.

This fixes fate failures on MSVC builds since 570af382.

Based on a patch by Hendrik Leppkes.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoAdd fieldmatch test
Timothy Gu [Mon, 10 Mar 2014 01:16:29 +0000 (18:16 -0700)]
Add fieldmatch test

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 9 Mar 2014 22:40:59 +0000 (23:40 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a823d0948683bd97dd58556b5740e434166209a8'
Michael Niedermayer [Sun, 9 Mar 2014 22:34:09 +0000 (23:34 +0100)]
Merge commit 'a823d0948683bd97dd58556b5740e434166209a8'

* commit 'a823d0948683bd97dd58556b5740e434166209a8':
  matroskaenc: write private data in hvcC format for HEVC.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hevc: fix mix of av_malloc() with free()
Michael Niedermayer [Sun, 9 Mar 2014 22:27:31 +0000 (23:27 +0100)]
avformat/hevc: fix mix of av_malloc() with free()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4f3db5d3418a24f3b90422e98ad75388052c4284'
Michael Niedermayer [Sun, 9 Mar 2014 22:13:19 +0000 (23:13 +0100)]
Merge commit '4f3db5d3418a24f3b90422e98ad75388052c4284'

* commit '4f3db5d3418a24f3b90422e98ad75388052c4284':
  movenc: allow muxing HEVC in MODE_MP4.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hevc: Make return codes consistent and more flexible
Michael Niedermayer [Sun, 9 Mar 2014 22:12:45 +0000 (23:12 +0100)]
avformat/hevc: Make return codes consistent and more flexible

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b6c61fb83e876d404ac3b0b3657ebfcafdcd1926'
Michael Niedermayer [Sun, 9 Mar 2014 22:07:48 +0000 (23:07 +0100)]
Merge commit 'b6c61fb83e876d404ac3b0b3657ebfcafdcd1926'

* commit 'b6c61fb83e876d404ac3b0b3657ebfcafdcd1926':
  movenc: enable Annex B to MP4 conversion for HEVC tracks.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat: fix hevcs use of golomb from avformat
Michael Niedermayer [Sun, 9 Mar 2014 21:59:46 +0000 (22:59 +0100)]
avformat: fix hevcs use of golomb from avformat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '20b40a597cdd4969cf1147d7c7efee2b6232524b'
Michael Niedermayer [Sun, 9 Mar 2014 21:48:08 +0000 (22:48 +0100)]
Merge commit '20b40a597cdd4969cf1147d7c7efee2b6232524b'

* commit '20b40a597cdd4969cf1147d7c7efee2b6232524b':
  movenc: write hvcC tag for HEVC.

Conflicts:
libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1d9014f0b008485eac4c19d5f5e11ede59237167'
Michael Niedermayer [Sun, 9 Mar 2014 21:31:16 +0000 (22:31 +0100)]
Merge commit '1d9014f0b008485eac4c19d5f5e11ede59237167'

* commit '1d9014f0b008485eac4c19d5f5e11ede59237167':
  movenc: use 'hev1' tag for HEVC in MODE_MOV.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3e0175d89a6c5ee8393ae05e1b40abdca1204919'
Michael Niedermayer [Sun, 9 Mar 2014 21:30:04 +0000 (22:30 +0100)]
Merge commit '3e0175d89a6c5ee8393ae05e1b40abdca1204919'

* commit '3e0175d89a6c5ee8393ae05e1b40abdca1204919':
  riff: add VP9 fourcc

See: eb7f7b797f0ae76a7cf6db7792365998ee6e9cba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'fb0a988f94c3b8907610172295a7f6bf78c57105'
Michael Niedermayer [Sun, 9 Mar 2014 21:28:59 +0000 (22:28 +0100)]
Merge commit 'fb0a988f94c3b8907610172295a7f6bf78c57105'

* commit 'fb0a988f94c3b8907610172295a7f6bf78c57105':
  riff: IPJ2 decodes with JPEG2000 decoder

See: b18c27def898e7499cf36b65b5debc4f303e7e5b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9e71cc81f3655cacf0f91860fba3043f13b64059'
Michael Niedermayer [Sun, 9 Mar 2014 21:26:39 +0000 (22:26 +0100)]
Merge commit '9e71cc81f3655cacf0f91860fba3043f13b64059'

* commit '9e71cc81f3655cacf0f91860fba3043f13b64059':
  movdec: handle 0x7fff langcode as macintosh per the specs

See: e636aa1a56bcd91242c25282dcb00929196470eb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8a0bc40545a216a49f43db5d9a42a63961333354'
Michael Niedermayer [Sun, 9 Mar 2014 21:25:17 +0000 (22:25 +0100)]
Merge commit '8a0bc40545a216a49f43db5d9a42a63961333354'

* commit '8a0bc40545a216a49f43db5d9a42a63961333354':
  libspeex: support ZygoAudio (quality 10 mode)

Conflicts:
libavformat/isom.c

See: e26b066cd8db361feba90e943c6cfdf062c52272
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '360022bd3b894cc01ea112b275fa4c8f53881808'
Michael Niedermayer [Sun, 9 Mar 2014 21:23:32 +0000 (22:23 +0100)]
Merge commit '360022bd3b894cc01ea112b275fa4c8f53881808'

* commit '360022bd3b894cc01ea112b275fa4c8f53881808':
  isom: lpcm in mov default to big endian

See: 8b3964ecd1bfc7ac65ae91013b404beb7d2c875a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'db32f14c3dfd75290b57a086183d6577457beac4'
Michael Niedermayer [Sun, 9 Mar 2014 21:22:05 +0000 (22:22 +0100)]
Merge commit 'db32f14c3dfd75290b57a086183d6577457beac4'

* commit 'db32f14c3dfd75290b57a086183d6577457beac4':
  isom: add "MNG" FourCC

See: 8d0ec6e060b23c8ef188d759f59ee1e536c494ed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '073cd30fb4dc1c2a885c62540e3cfaac1f17c21b'
Michael Niedermayer [Sun, 9 Mar 2014 21:20:33 +0000 (22:20 +0100)]
Merge commit '073cd30fb4dc1c2a885c62540e3cfaac1f17c21b'

* commit '073cd30fb4dc1c2a885c62540e3cfaac1f17c21b':
  isom: Support MPEG-2 video mov files from FPC5

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