generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
62,494 Commits 24 Branches 241 Tags 173 MiB
443261cbbd
Commit Graph

14899 Commits

Author SHA1 Message Date
Anh
c150e2cf32 Fix compilation with --disable-everything --enable-muxer=avi --disable-network. 
Fixes ticket #3568.
 2014-04-16 20:00:17 +02:00
Michael Niedermayer
dd77f6469a avformat/ico: use avmalloc(z)_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-16 19:41:41 +02:00
Michael Niedermayer
572f5eb1af avformat/mpegenc: try to improve the VBV buffer warning 
Maybe fixes Ticket 3494
Part of the message suggested by: rogerdpack
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-16 17:20:07 +02:00
Michael Niedermayer
ff6fa0b4b9 avformat/mpegts: Remove redundant check 
Fixes part of Ticket3466
Found-by: Andrey_Karpov / PVS-Studio
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-16 02:35:50 +02:00
Michael Niedermayer
79d82a6574 avformat/hnm: fix decoding of 256x256 video 
Fixes Ticket3464
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-16 01:37:38 +02:00
Michael Niedermayer
bdc812ab9e avformat/flacdec/flac_read_timestamp: free the correct packet 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-16 00:23:31 +02:00
Michael Niedermayer
6d8ccc7ac7 avformat/flacdec/flac_read_timestamp: dont modify AVStream state 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-15 23:53:31 +02:00
Michael Niedermayer
eead2cddb7 avformat/xmv: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-15 13:51:48 +02:00
Michael Niedermayer
337f74868c avformat/mpegtsenc: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-15 13:51:48 +02:00
Michael Niedermayer
083b6e739b avformat/utils: fix typo 
Found-by: reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-15 13:51:48 +02:00
Michael Niedermayer
ef818d8bf0 avformat: add av_format_inject_global_side_data(), and disable it by default 
After this commit applications needs to call av_format_inject_global_side_data()
or handle AVStream side data by some other means if they want it not to be lost.

This fixes a API incompatibility with libav.
libav API does not allow the data to be passed through AVPackets

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-15 02:37:40 +02:00
Michael Niedermayer
b465aaa59f avformat/img2dec: fix typo 
Found-by: Reimar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-14 21:40:59 +02:00
Michael Niedermayer
3df787a1ef Merge branch 'flac' of https://github.com/FernetMenta/FFmpeg 
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-14 18:35:02 +02:00
Rainer Hochecker
e1fcd3a007 flac demuxer: improve seeking 2014-04-14 17:43:19 +02:00
Carl Eugen Hoyos
63c03ea98d Fix writing RGB 5:5:5 rawvideo into avi. 
WMP expects bits per pixel to be set to 16 for RGB 5:5:5 rawvideo.
 2014-04-14 15:34:38 +02:00
Stephan Soller
36b9c27dae avformat/rtmpproto: Added handling of an initial RTMP chunk size packet. 
Fixes ticket #2911.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-14 14:28:22 +02:00
Michael Niedermayer
8e5f840472 Merge commit '6477139721f559b26eafd415e23e13ea2b0c27e1' 
* commit '6477139721f559b26eafd415e23e13ea2b0c27e1':
  rtmpproto: Make sure to pass on the error code if read_connect failed

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-14 14:12:47 +02:00
Martin Storsjö
6477139721 rtmpproto: Make sure to pass on the error code if read_connect failed 
Previously, if read_connect failed, the ret variable was unmodified
and had the value 0, indicating success, which then was returned from
the rtmp_open function, even though it actually failed.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-04-14 11:09:20 +03:00
Michael Niedermayer
2ebacb0fc4 avformat/network: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-13 23:39:49 +02:00
Michael Niedermayer
eccec20397 avformat/mp3enc: drop redundant and uninitialized variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-13 20:03:24 +02:00
Michael Niedermayer
82796aacab avformat/utils: reinject global side data on seeks 
This fixes ffplay replaygain with seeking

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-13 18:27:05 +02:00
Michael Niedermayer
c0d62d999d avformat/utils: factorize if() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-13 18:02:42 +02:00
Michael Niedermayer
289f02f923 avformat/utils: Inject global side data into first packet. 
This fixes replaygain handling in ffplay and probably other applications.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-13 18:02:05 +02:00
Peter Ross
e311b7446a avformat/iff: indent 
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-13 14:48:36 +02:00
Peter Ross
d95c9679f7 avformat/iff: remove unused code 
bits_per_coded_sample and block_align are calculated again at end of if() block

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-13 14:48:29 +02:00
Michael Niedermayer
571d2ffa47 Merge commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03' 
* commit '617a1a98a6be3e59db6fbfc21afab2fb9a049c03':
  mp3enc: Properly write bitrate value in XING header

Conflicts:
	libavformat/mp3enc.c

See: 40176fc314
See: d62bf5d4e7
See: various others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-12 21:26:20 +02:00
Michael Niedermayer
617a1a98a6 mp3enc: Properly write bitrate value in XING header 
Instead of using a fixed bitrate_idx, calculate a matching bitrate for
the XING header.

Using a fixed bitrate_idx causes tools such as file(1) and mediainfo(1)
to report wrong bitrate and bitrate mode when using CBR.

Bug-Id: https://bugs.debian.org/736088

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-04-12 13:29:55 +02:00
Michael Niedermayer
f683895dee avformat/img2dec: support nanosecond file times 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-12 04:52:01 +02:00
Michael Schenk
513a431e07 avformat/hls: reduce memory usage by using dynamically allocated url/key 
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
 2014-04-12 03:14:52 +03:00
Carl Eugen Hoyos
c43222f436 Improve amr bitrate calculation for VBR files. 
Fixes ticket #3541.
 2014-04-11 23:38:53 +02:00
Carl Eugen Hoyos
8b122937af Warn if rawvideo and an unreadable pix_fmt are written. 
Print an error if a combination of rawvideo and an unusual pix_fmt
that will be impossible to decode are written to avi or mov.
Fixes ticket #3545.
 2014-04-11 23:35:11 +02:00
Lukasz Marek
6db42a2b6b lavd: add device capabilities API 
Provides API to query device capabilities.
Each device must implement callbacks to benefit from this API.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-04-11 15:37:43 +02:00
Anssi Hannula
39b192b8e1 avformat/hls: do not call ffurl_seek/ffurl_size on crypto protocol 
ffurl_seek() will not work even when it should be a no-op, so do not
call it on crypto protocol.

Also replace use of ffurl_size() for the same reason.

Reported-by: Michael Schenk <Michael.Schenk@albistechnologies.com>
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
 2014-04-11 00:04:34 +03:00
James Almer
09c1654208 lavf/rtspcodes: add missing header include 
Fixes make checkheaders

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-10 21:57:04 +02:00
Michael Niedermayer
4d4bc89409 avformat/mov: merge mov_read_custom_metadata() and mov_read_custom() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-10 21:25:51 +02:00
Michael Niedermayer
6e573b7759 Merge commit '9a07fac678a8540d076e635061bbaa4ed09a9431' 
* commit '9a07fac678a8540d076e635061bbaa4ed09a9431':
  mov: read hydrogenaudio replaygain information

Conflicts:
	libavformat/Makefile
	libavformat/mov.c

See: 37a15f3e66
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-10 21:25:15 +02:00
Anton Khirnov
9a07fac678 mov: read hydrogenaudio replaygain information 2014-04-10 13:53:32 +02:00
Lukasz Marek
e1c48e3593 lavf/utils: fix mem leak 
Calling avformat_free_context() right after avformat_alloc_output_context2()
leaved option's default values not freed.
Options were freed only in av_write_trailer().

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-10 03:24:07 +02:00
Michael Niedermayer
421c116fc4 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Fix a typo in amr.c.
  Remove an unneeded include of avassert.h from amr.c.
  Do not allow writing invalid wav channel layouts by default.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-10 00:33:57 +02:00
Michael Niedermayer
968516cebf avformat/nut: add ff_nut_audio_extra_tags to demuxer too 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-09 23:37:55 +02:00
Carl Eugen Hoyos
cf79f20275 Fix a typo in amr.c. 2014-04-09 23:21:38 +02:00
Carl Eugen Hoyos
2a3ff9fbba Remove an unneeded include of avassert.h from amr.c. 2014-04-09 23:21:38 +02:00
Carl Eugen Hoyos
bf87d582b1 Do not allow writing invalid wav channel layouts by default. 
Neither WMP nor QT play wav files with too large channel layouts.
Fixes ticket #3543.
 2014-04-09 23:21:38 +02:00
Vittorio Giovara
b6a09ef700 rawvideo: Support decoding YVYU422 FourCC 2014-04-08 23:24:36 +02:00
Anshul Maheshwari
5b30f27592 rtspcodes: don't check for >0 on error codes macro 
Avoids a warning with gcc 4.7 and -Wtype-limits. Albeit
superfluous (At least gcc 4.8 didnt consider this been
a problem).

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
 2014-04-08 18:05:02 -03:00
Schenk, Michael
845414bbb1 avformat/oggdec: reset nstreams in close 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-07 14:55:35 +02:00
Schenk, Michael
b0a8521383 avformat/mov: reset drefs_count in close 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-07 14:51:36 +02:00
Reynaldo H. Verdejo Pinochet
5267a5d783 rtspcodes: add full list of RTSP status codes 
Also add reason phrases from http://www.ietf.org/rfc/rfc2326.txt
and macro to translate.

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
 2014-04-07 00:24:00 -03:00
Michael Niedermayer
01a5d71789 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Set Matroska private data when muxing Prores.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-06 23:57:42 +02:00
Carl Eugen Hoyos
3d5c859fa6 Set Matroska private data when muxing Prores. 
The specification requires the mov code point to be written as "fourcc".
 2014-04-06 23:35:17 +02:00