virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
61,333 Commits 37 Branches 400 Tags 458 MiB
675a66a93b
Commit Graph

61333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
675a66a93b doc: switch github urls to https 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 23:05:26 +01:00
Michael Niedermayer
835f41376d 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>
 2014-03-12 23:02:56 +01:00
Michael Niedermayer
e5920425b0 Merge commit '5a7f382a5d33d9a26890affe6c8c5070a48dfc22' 
* commit '5a7f382a5d33d9a26890affe6c8c5070a48dfc22':
  armv6: vp8: use explicit labels in motion compensation asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 22:03:00 +01:00
Michael Niedermayer
58b8d268d9 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>
 2014-03-12 21:45:02 +01:00
Michael Niedermayer
990f956ce6 Merge commit 'b4e355c89e23664b8dac26936bf3fa7e7bc2110f' 
* commit 'b4e355c89e23664b8dac26936bf3fa7e7bc2110f':
  copy_block: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 21:35:58 +01:00
Michael Niedermayer
aa175983a1 Merge commit 'b3c6ee199e75bbad2908253f11e871500dd38531' 
* commit 'b3c6ee199e75bbad2908253f11e871500dd38531':
  configure: Group toolchain options together in help output

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 21:05:00 +01:00
Michael Niedermayer
7e6c6c45ec Merge commit 'e77a2ea9505863e50bf013706f66bf8b7325e524' 
* commit 'e77a2ea9505863e50bf013706f66bf8b7325e524':
  http: Declare more parameters as const where possible

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 20:50:29 +01:00
Martin Storsjö
d15c536123 doc: Point to the correct, actually maintained gas-preprocessor repo 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-03-12 20:43:55 +02:00
Janne Grunau
5a7f382a5d 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.
 2014-03-12 15:06:05 +01:00
Luca Barbato
aa80742539 configure: Support older version of openjpeg1 
It should work best for debian stable and people not installing the .pc
file.
 2014-03-12 14:06:21 +01:00
Vittorio Giovara
b4e355c89e copy_block: K&R formatting cosmetics 2014-03-12 14:01:41 +01:00
Diego Biurrun
b3c6ee199e configure: Group toolchain options together in help output 2014-03-12 14:00:19 +01:00
Michael Niedermayer
ad341b3bc6 update doc/APIchanges 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 13:51:09 +01:00
Fred Rothganger
3f3229cd10 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>
 2014-03-12 13:33:14 +01:00
Bryce McLeod
581957cd86 avformat/movenc: rescale when copying duration to timecode track 
Fixes Ticket3453

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 12:52:27 +01:00
Stephen Hutchinson
5336cd6374 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>
 2014-03-12 12:45:24 +01:00
Martin Storsjö
e77a2ea950 http: Declare more parameters as const where possible 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-03-12 13:24:58 +02:00
Michael Niedermayer
3ddf76ee07 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Revert "Allow stream-copying grayscale mov files."

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 12:20:06 +01:00
Michael Niedermayer
1f36ebf63a avformat: revert %c changes from d92024f18f 
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 05:09:28 +01:00
Michael Niedermayer
cd25412f59 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  http: Allow setting a Content-Type for POST requests

Conflicts:
	libavformat/http.c

See: c01d1d4ddf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 04:53:54 +01:00
Michael Niedermayer
0d487654ea Merge commit 'fe568b3d27ca2c5cca3878b2a7a3a968e605aec4' 
* commit 'fe568b3d27ca2c5cca3878b2a7a3a968e605aec4':
  http: Improve options descriptions

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

See: 255ec768da
See: 0a7cd74043
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 04:43:21 +01:00
Michael Niedermayer
1cc9468289 Merge commit 'ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab' 
* commit 'ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab':
  http: Always allow no-op seek

Conflicts:
	libavformat/http.c

See: 857841c1b6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 04:29:54 +01:00
Michael Niedermayer
76a939d0e5 Merge commit '2ec33d27127251bbc45e1f88e60691ad59cf2319' 
* commit '2ec33d27127251bbc45e1f88e60691ad59cf2319':
  http: Add support for selecting a request range

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

See: d52882faef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 04:12:30 +01:00
Michael Niedermayer
f36da16ede Merge commit 'ddfc98906373d1f17f6205cedd14c68d7a75995f' 
* commit 'ddfc98906373d1f17f6205cedd14c68d7a75995f':
  http: Support setting custom User-Agent

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

See: 2bb1c713cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 03:45:16 +01:00
Michael Niedermayer
c03af3ac1c Merge commit 'e58c85b0686892960042232e51c77168b264838a' 
* commit 'e58c85b0686892960042232e51c77168b264838a':
  http: Export Content-Type information

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

See: 76d851b656
See: 20899c54f0
See: 255ec768da
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 03:33:14 +01:00
Michael Niedermayer
ca2369cdee Merge commit '8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab' 
* commit '8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab':
  http: Add support reading ICY metadata

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

See: a92fbe16f2
See: 636273d3d4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 03:18:12 +01:00
Michael Niedermayer
21d4c571fa Merge commit '4ff99ab3d7d5576e99e6b8a411b4a44500ed88fa' 
* commit '4ff99ab3d7d5576e99e6b8a411b4a44500ed88fa':
  http: Refactor process_line

Conflicts:
	libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 02:52:17 +01:00
Michael Niedermayer
df41cbee85 Merge commit '7a2fddb4480121712df560cf619c1c3566cae3ff' 
* commit '7a2fddb4480121712df560cf619c1c3566cae3ff':
  http: K&R formatting cosmetics

Conflicts:
	libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 02:45:34 +01:00
Michael Niedermayer
b752d02f42 Merge commit '78b21c1d7177e1d61ad3c9225f67699da089aa7c' 
* commit '78b21c1d7177e1d61ad3c9225f67699da089aa7c':
  http: Drop doxy comments

Conflicts:
	libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 02:39:46 +01:00
Michael Niedermayer
03fd80dcb1 Merge commit '55a215ba63d9fa79cd7ee265ee2e777ee86b200c' 
* commit '55a215ba63d9fa79cd7ee265ee2e777ee86b200c':
  http: Return meaningful error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 02:34:02 +01:00
Michael Niedermayer
3a05d7a9e5 Merge commit '390acbea0697a60300f249602dbf701e04274693' 
* commit '390acbea0697a60300f249602dbf701e04274693':
  configure: Provide --pkg-config-flags

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 02:22:16 +01:00
Michael Niedermayer
85e1368f57 Merge commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf' 
* commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf':
  avformat: Report the duration analysis reached

Conflicts:
	libavformat/utils.c

See: 8529f9b36b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 02:11:47 +01:00
Michael Niedermayer
dbc3e1109c avformat/flvdec: discard inconsistent timestamps 
Fixes Ticket3425

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 01:50:41 +01:00
Michael Niedermayer
774668763a ffplay: display information on stream cycling 
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 00:32:38 +01:00
Clément Bœsch
2572d07c1f http: Allow setting a Content-Type for POST requests 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-03-11 22:08:57 +01:00
Alessandro Ghedini
fe568b3d27 http: Improve options descriptions 
Add documentation where missing.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-03-11 22:08:57 +01:00
Anssi Hannula
ab76d9f628 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>
 2014-03-11 22:08:57 +01:00
Anssi Hannula
2ec33d2712 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>
 2014-03-11 22:08:57 +01:00
Clément Bœsch
ddfc989063 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>
 2014-03-11 22:08:57 +01:00
Michael Niedermayer
e58c85b068 http: Export Content-Type information 
Bug-Id: https://bugs.debian.org/740421

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-03-11 22:08:57 +01:00
Luca Barbato
8075c3d8bb 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>
 2014-03-11 22:08:57 +01:00
Luca Barbato
4ff99ab3d7 http: Refactor process_line 2014-03-11 22:08:56 +01:00
Luca Barbato
7a2fddb448 http: K&R formatting cosmetics 2014-03-11 22:08:56 +01:00
Luca Barbato
78b21c1d71 http: Drop doxy comments 2014-03-11 22:08:56 +01:00
Luca Barbato
55a215ba63 http: Return meaningful error codes 2014-03-11 22:08:56 +01:00
Luca Barbato
390acbea06 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>
 2014-03-11 21:55:11 +01:00
Luca Barbato
db9d39b4b5 avformat: Report the duration analysis reached 2014-03-11 21:55:11 +01:00
Michael Niedermayer
50a3c82302 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>
 2014-03-11 21:24:54 +01:00
Michael Niedermayer
a1b92569db Merge commit '5926603ad65e5fd4fefe8f0d72c381059f71cd59' 
* commit '5926603ad65e5fd4fefe8f0d72c381059f71cd59':
  configure: Document --pkg-config option

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-11 21:12:57 +01:00
Michael Niedermayer
28ee7757f5 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>
 2014-03-11 21:05:34 +01:00