videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-07-23 20:51:29 +02:00
Code Releases Activity
65,210 Commits 36 Branches 392 Tags 210 MiB
b7f8d3de2c
Commit Graph

65210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gerion.entrup@t-online.de
f2855eb4d7 avformat/movenc: add m4b to list of ipod playable files 
m4b is the extension used by iDevices to detect audiobooks.
 2014-07-30 04:19:58 +02:00
Christophe Gisquet
a507623bad x86: hevc_mc: fix register count usage 
A macro was using a fixed register, causing too many GPRs to be
declared as used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 22:50:50 +02:00
Michael Niedermayer
d38edeee9b avformat/format: fix memleak and error code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 21:38:15 +02:00
Michael Niedermayer
4182728c78 avformat/format.c: remove duplicate include, put libavutil includes together 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 21:35:07 +02:00
Michael Niedermayer
6d69503883 avformat/format: simplify ifdeffery 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 21:33:10 +02:00
Michael Niedermayer
58eaa95116 Merge commit 'ccbf370f2000b9b27f4af259c23007d67f7ea46e' 
* commit 'ccbf370f2000b9b27f4af259c23007d67f7ea46e':
  mpegvideo: move vol_control_parameters to the only place it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 21:26:59 +02:00
Michael Niedermayer
92de445034 Merge commit 'fa38573cd9ce4ab727f86f57c03b113cfd4c9d0a' 
* commit 'fa38573cd9ce4ab727f86f57c03b113cfd4c9d0a':
  matroska: Register mime types

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 21:18:11 +02:00
Michael Niedermayer
8cad746093 Merge commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd' 
* commit '02cf0c9e42967de1e4d2803bee3573bc5b735fdd':
  aac: Register the mime type

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 21:12:07 +02:00
Michael Niedermayer
9694695a21 avformat: fix probe mime version checks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 21:02:48 +02:00
Michael Niedermayer
80a3a6611f Merge commit '3a19405d574a467c68b48e4b824c76617fd59de0' 
* commit '3a19405d574a467c68b48e4b824c76617fd59de0':
  avformat: Use the mime type information in input probe

Conflicts:
	libavformat/format.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 20:57:42 +02:00
Michael Niedermayer
31e0b5d3cb Merge commit '69e7336b8e16ee65226fc20381baf537f4b125e6' 
* commit '69e7336b8e16ee65226fc20381baf537f4b125e6':
  avstring: Expose the simple name match function

Conflicts:
	libavutil/avstring.c
	libavutil/avstring.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 20:24:42 +02:00
Michael Niedermayer
e066f01539 Merge commit 'e253a9e2b3d683eb51db7c776326eb07de10ad4c' 
* commit 'e253a9e2b3d683eb51db7c776326eb07de10ad4c':
  avformat: Move av_probe_input* to format.c

Conflicts:
	libavformat/format.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 20:02:09 +02:00
Diego Biurrun
a8d803a320 vf_select: Drop a debug av_log with an unchecked double to enum conversion 
CC: libav-stable@libav.org
 2014-07-29 09:37:01 -07:00
Nidhi Makhijani
ccbf370f20 mpegvideo: move vol_control_parameters to the only place it is used 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-07-29 09:13:18 -07:00
Luca Barbato
fa38573cd9 matroska: Register mime types 2014-07-29 17:47:32 +02:00
Luca Barbato
02cf0c9e42 aac: Register the mime type 
Speed up probing ADTS live streams that are not frame-aligned such
as http://mp3.streampower.be/radio1.aac .
 2014-07-29 17:47:32 +02:00
Luca Barbato
3a19405d57 avformat: Use the mime type information in input probe 
It should provide a quicker guess for elementary streams provided
by http.
 2014-07-29 17:47:26 +02:00
Luca Barbato
69e7336b8e avstring: Expose the simple name match function 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-07-29 17:46:29 +02:00
Nicolas Martyanoff
0c889da8cb avformat/hlsenc: fix cleanup after avformat_write_header() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 16:24:11 +02:00
Luca Barbato
e253a9e2b3 avformat: Move av_probe_input* to format.c 2014-07-29 15:18:51 +02:00
James Almer
73c4f63ba5 x86/hevc_deblock: add add ff_hevc_[hv]_loop_filter_luma_{8, 10, 12}_avx 
~5% faster than SSSE3

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 14:04:59 +02:00
James Almer
88ba821f23 x86/hevc_deblock: improve luma functions register allocation 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 13:38:05 +02:00
James Almer
c74b08c5c6 x86/hevc_deblock: remove some unnecessary instructions 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 13:27:44 +02:00
Christophe Gisquet
65746bfbae hevc_filter: run vertical and horizontal together 
This should help cache locality. On win64:
Before: 1397x cycles, 16216 bytes
After:  1369x cycles, 16040 bytes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 03:56:43 +02:00
James Almer
4f91bb0ff0 x86/hevc_deblock: use psignw instead of pmullw where possible 
It's slightly faster

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 03:42:29 +02:00
Michael Niedermayer
983109bbd9 Merge commit '942269fd00cb48328e4cffb6e21a0b691ce9f6bc' 
* commit '942269fd00cb48328e4cffb6e21a0b691ce9f6bc':
  caf: Use correct printf conversion specifiers for POSIX int types

Conflicts:
	libavformat/cafdec.c

See: 1f36ebf63a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 01:40:23 +02:00
Michael Niedermayer
d55d8229fb Merge commit '019a28cd630286ecb2b06ee62025a17c821b493e' 
* commit '019a28cd630286ecb2b06ee62025a17c821b493e':
  sanm: Use correct printf conversion specifiers for POSIX int types

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 01:22:46 +02:00
Michael Niedermayer
60831f441d Merge commit '59ca29a560ba0cfe97457de8cedf77db434f0de4' 
* commit '59ca29a560ba0cfe97457de8cedf77db434f0de4':
  dump: Use correct printf conversion specifiers for POSIX int types

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 00:41:00 +02:00
Michael Niedermayer
a91c5ed008 Merge commit '4f8cf0dc4ef6110174056df7edd9dc2f2a988b6d' 
* commit '4f8cf0dc4ef6110174056df7edd9dc2f2a988b6d':
  x86: build: Restore ordering of OBJS lines

Conflicts:
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 00:34:53 +02:00
Michael Niedermayer
621d4089a4 Merge commit 'e4a462e3eafdfe336f4d079c3ba72a9cdb4748b0' 
* commit 'e4a462e3eafdfe336f4d079c3ba72a9cdb4748b0':
  configure: Use require_pkg_config for Speex

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 00:28:23 +02:00
Michael Niedermayer
8b1e920676 Merge commit '259fe7280d0b63dc7a8ff017d44f26d3a84cfde8' 
* commit '259fe7280d0b63dc7a8ff017d44f26d3a84cfde8':
  mxf: Extract origin information from material and source track

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 00:18:03 +02:00
Michael Niedermayer
4a4d0258ee Merge commit 'c9d982aa11a6267611c3770792f0e04b48438348' 
* commit 'c9d982aa11a6267611c3770792f0e04b48438348':
  mxf: Detect Vanc/Vbi SMPTE-436M mxf track

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 00:12:03 +02:00
Michael Niedermayer
25a2060890 Merge commit 'dc71f1958846bb1d96de43a4603983dc8450cfcc' 
* commit 'dc71f1958846bb1d96de43a4603983dc8450cfcc':
  video4linux2: Avoid a floating point exception

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-29 00:06:32 +02:00
Carl Eugen Hoyos
63c0b41904 Fix standalone compilation of the adts muxer. 2014-07-28 23:25:54 +02:00
Diego Biurrun
942269fd00 caf: Use correct printf conversion specifiers for POSIX int types 2014-07-28 13:19:05 -07:00
Diego Biurrun
019a28cd63 sanm: Use correct printf conversion specifiers for POSIX int types 2014-07-28 13:19:04 -07:00
Diego Biurrun
59ca29a560 dump: Use correct printf conversion specifiers for POSIX int types 2014-07-28 13:19:04 -07:00
Diego Biurrun
4f8cf0dc4e x86: build: Restore ordering of OBJS lines 2014-07-28 13:19:04 -07:00
Luca Barbato
e4a462e3ea configure: Use require_pkg_config for Speex 
Distributors and integrators nowadays have less problems by leveraging
pkg-config files than having to set custom CFLAGS and LDFLAGS.
 2014-07-28 22:17:42 +02:00
Marc-Antoine Arnaud
259fe7280d mxf: Extract origin information from material and source track 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-07-28 22:17:42 +02:00
Marc-Antoine Arnaud
c9d982aa11 mxf: Detect Vanc/Vbi SMPTE-436M mxf track 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-07-28 22:17:42 +02:00
Bernhard Übelacker
dc71f19588 video4linux2: Avoid a floating point exception 
This avoids a segfault in avconv_opt.c:opt_target when trying to
determine the norm.
 2014-07-28 13:11:41 -07:00
James Almer
664e9e4331 x86/hevc_deblock: load less data in hevc_h_loop_filter_luma_8 
Reading 8 bytes is enough.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-28 21:55:22 +02:00
James Almer
f137876182 x86/hevc_idct: add a colon to labels 
This fixes a warning spam when using NASM

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-28 21:43:32 +02:00
Michael Niedermayer
1e51af13c7 avdevice/pulse_audio_enc: use getter function for AVFrame.channels 
This is required by the API/ABI for things outside libavutil

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-28 20:06:11 +02:00
Michael Niedermayer
d554d004a6 tests/fate.sh: If cat *.rep fails try it with a for loop. 
Fixes fate on haiku, where cat dies due to too many arguments
xargs could be used too but we do not use xargs currently so it
would be an additional dependency.

Also the plain cat is left in place as it is faster than the loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-28 18:34:16 +02:00
Michael Niedermayer
f3158c3f29 version.sh: Print versions based on the last git tag for release branches 
release branches are detected by checking if "git" is not in RELEASE
This changes "N-64706-g2f71aeb" to "n2.3-8-g2f71aeb"
for git master theres no change

This should improve the readability of lists of versions which come from
more than 1 release branch or master + release. fate.ffmpeg.org is
one possible example

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ee606fd031)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-28 15:44:59 +02:00
Michael Niedermayer
243236a6f5 avcodec/hevc: fix "discards const qualifier from pointer target type" warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-28 14:34:47 +02:00
Michael Niedermayer
772dfd5f6e avcodec/hevc: add some const to cbf arrays 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-28 14:28:56 +02:00
Mickaël Raulet
42ffa226f9 hevc: clean up non relevant TODO 
cherry picked from commit a2ef95f043d89d05482af19460c9e9afdadec685

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-28 14:27:04 +02:00