]>
git.sesse.net Git - ffmpeg/log
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>
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>
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>
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>
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>
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>
Diego Biurrun [Wed, 29 Jan 2014 14:10:41 +0000 (15:10 +0100)]
build: Drop stray PNG 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
Reinhard Tartler [Thu, 13 Mar 2014 12:22:26 +0000 (08:22 -0400)]
Prepare for 11_alpha1 Release
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.
Carl Eugen Hoyos [Thu, 13 Mar 2014 07:34:45 +0000 (08:34 +0100)]
Fix hardware detection on aix.
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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.
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.
Vittorio Giovara [Mon, 10 Mar 2014 20:44:26 +0000 (21:44 +0100)]
copy_block: K&R formatting cosmetics
Diego Biurrun [Tue, 11 Mar 2014 17:52:44 +0000 (18:52 +0100)]
configure: Group toolchain options together in help output
Michael Niedermayer [Wed, 12 Mar 2014 12:51:09 +0000 (13:51 +0100)]
update doc/APIchanges
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Michael Niedermayer [Wed, 12 Mar 2014 02:28:43 +0000 (03:28 +0100)]
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Luca Barbato [Mon, 10 Mar 2014 19:16:50 +0000 (20:16 +0100)]
http: Refactor process_line
Luca Barbato [Mon, 10 Mar 2014 17:02:09 +0000 (18:02 +0100)]
http: K&R formatting cosmetics
Luca Barbato [Mon, 10 Mar 2014 16:53:51 +0000 (17:53 +0100)]
http: Drop doxy comments
Luca Barbato [Mon, 10 Mar 2014 16:17:25 +0000 (17:17 +0100)]
http: Return meaningful error codes
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>
Luca Barbato [Tue, 11 Mar 2014 12:41:18 +0000 (13:41 +0100)]
avformat: Report the duration analysis reached
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>
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>
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>
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>
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>
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.
Luca Barbato [Tue, 11 Mar 2014 18:12:05 +0000 (19:12 +0100)]
configure: Document --pkg-config option
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>
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>
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>
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>
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>
Diego Biurrun [Mon, 10 Mar 2014 14:35:59 +0000 (15:35 +0100)]
lavf: more correct printf format specifiers
Carl Eugen Hoyos [Tue, 11 Mar 2014 08:56:38 +0000 (09:56 +0100)]
Decode png images without iend chunk.
Fixes ticket #3357.
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>
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>
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>
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>
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>
Michael Niedermayer [Mon, 10 Mar 2014 22:54:55 +0000 (23:54 +0100)]
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.
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>
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>
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>
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>
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>
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.
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.
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().
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>
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>
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.
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.
Luca Barbato [Mon, 10 Mar 2014 09:57:51 +0000 (10:57 +0100)]
golomb: Add a get_se_golomb_long
Useful in libavformat mostly.
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
[....]
}