virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
61,475 Commits 37 Branches 400 Tags 460 MiB
dadf668df2
Commit Graph

14667 Commits

Author SHA1 Message Date
Peter Ross
dadf668df2 avformat/mov: decode compilation metadata 
This flag is known as 'Part of a compilation' in Apple iTunes.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-15 04:28:58 +01:00
Michael Niedermayer
b5bdd04f08 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  aac: K&R formatting cosmetics

Conflicts:
	libavformat/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-14 12:00:45 +01:00
Luca Barbato
afdf94689c aac: K&R formatting cosmetics 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-03-14 01:24:31 +01:00
Michael Niedermayer
bb6de15d92 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: Match stream id

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

See: ea07063fd8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 14:21:27 +01:00
Michael Niedermayer
72d44f1583 mvformat/movenc: fix IMX 
fixes Ticket3351

Tested-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-13 01:28:43 +01:00
Michael Niedermayer
11ed7ec092 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  http: Properly initialize icy headers string

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-12 23:24:19 +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
Alessandro Ghedini
6998a9f4c4 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>
 2014-03-12 20:13:36 +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
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
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
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
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
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
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
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
db9d39b4b5 avformat: Report the duration analysis reached 2014-03-11 21:55:11 +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
Carl Eugen Hoyos
54bbe3e2a6 Revert "Allow stream-copying grayscale mov files." 
This reverts commit 691dec6201.

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.
 2014-03-11 20:09:07 +01:00
Michael Niedermayer
5d75730c58 avformat/avidec: Check required demuxing buffer sizes in guess_ni_flag() 
Fixes Ticket3421

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-11 19:20:47 +01:00
Michael Niedermayer
01000064c9 avidec: calculate missing bitrates from index 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-11 19:20:47 +01:00
Anshul Maheshwari
61f96be08a Documented av_dump_format 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-11 13:24:53 +01:00
Matt Oliver
99b48fd448 Fix modplug linkage on Windows. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-11 13:22:49 +01:00
Diego Biurrun
d92024f18f lavf: more correct printf format specifiers 2014-03-11 13:13:41 +01:00
Michael Niedermayer
4775424446 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>
 2014-03-11 00:53:24 +01:00
Michael Niedermayer
7f90055470 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>
 2014-03-10 23:38:01 +01:00
Michael Niedermayer
b73cf4eb15 Merge commit 'ee17be3fdd37f63f4b77676820e387858908b0f4' 
* commit 'ee17be3fdd37f63f4b77676820e387858908b0f4':
  hevc: Use get_se_golomb_long

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-10 22:51:49 +01:00
Michael Niedermayer
77e9123fe5 lavf: always use av_free 
Signed-off-by: Tim Walker <tdskywalker@gmail.com>
 2014-03-10 18:02:55 +01:00
Tim Walker
34bbc81de8 lavf: simplify ff_hevc_annexb2mp4_buf 
Use ff_hevc_annexb2mp4 instead of duplicating
its functionality, and update the documentation
to match the new behavior.
 2014-03-10 18:02:36 +01:00
Carl Eugen Hoyos
d68ac92dc2 Replace an incorrect av_free() in movenc.c with av_freep(). 2014-03-10 13:30:51 +01:00