wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
69325 commits 40 branches 405 tags 230 MiB
Commit graph

16660 commits

Author SHA1 Message Date
Michael Niedermayer
be023405a7 Merge commit 'f771b3ab5d' 
* commit 'f771b3ab5d':
  avidec: do not export stream_codec_tag

Conflicts:
	libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-27 16:17:42 +01:00
Anton Khirnov
f771b3ab5d avidec: do not export stream_codec_tag 
Handle its only existing use case internally.
 2015-01-27 09:13:45 +01:00
Kevin Wheatley
7b6f419176 avformat/movenc: Add simplistic 'colr' tag writing support to mov container 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-26 17:49:50 +01:00
Carl Eugen Hoyos
fe47cba7e8 Decode Prores 4444 XQ with the existing Prores decoder. 
The frames are said to contain a higher bit-depth but
users report that our decoder shows visually correct output.
Requested by forum user gregba and Christoph Gerstbauer.
 2015-01-26 12:05:14 +01:00
Michael Niedermayer
da048c6d24 avformat/movenc: Check failure of allocation of ctts_entries and propagate error 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-25 14:32:22 +01:00
Michael Niedermayer
47785b44b5 avformat/movenc: fix cleanup on insufficient reserved_moov_size 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-25 14:28:43 +01:00
Michael Niedermayer
a1062e1437 avformat/matroskadec: Use av_malloc_array() for index_entries 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-25 00:26:53 +01:00
Michael Niedermayer
c1cdce5dcb avformat/matroskadec: Check av_mallocz() return values 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-25 00:26:39 +01:00
Michael Niedermayer
0c00e734ef Merge commit '7915e6741d' 
* commit '7915e6741d':
  hlsproto: Properly close avio buffer in case of error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-23 22:27:48 +01:00
Michael Niedermayer
72d99c8c26 avformat/dv: check av_malloc() return code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-23 18:15:43 +01:00
Michael Niedermayer
d36e66bb26 avformat/librtmp: Fix build with --disable-network --enable-librtmp 
Found-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-23 17:45:35 +01:00
Vittorio Giovara
3a6dfec864 segment: Check av_get_frame_filename() return value 
CC: libav-stable@libav.org
Bug-Id: CID 1265713
 2015-01-23 14:55:03 +00:00
Vittorio Giovara
7915e6741d hlsproto: Properly close avio buffer in case of error 
Fix a memory leak.

CC: libav-stable@libav.org
Bug-Id: CID 717999
 2015-01-23 14:55:03 +00:00
Vittorio Giovara
4c5fa628da mov: Do not compute negative SAR values 
This partially reverts cf70ba37ba, since
it didn't take into account when rotation is 0, but there is another
valid operation (eg. translation) in the matrix.

Found-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-23 14:54:59 +00:00
Jon Morley
47372caac5 libavformat/mov.c: Handle timecode from tmcd atom in counter mode 
When the timecode value is in counter mode then it is important to use
the timescale and frameduration to calculate the timecode fps.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-23 13:14:15 +01:00
Michael Niedermayer
0982077be5 Merge commit '9108967513' 
* commit '9108967513':
  rtspdec: Consistently use rtsp_hd_out for writing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-23 12:26:47 +01:00
Martin Storsjö
9108967513 rtspdec: Consistently use rtsp_hd_out for writing 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-01-23 10:33:00 +02:00
Werner Robitza
4b46ce8e91 avformat: allow .264 as extension for raw H.264 stream 
In addition to .h264, .264 is also commonly used by people to name raw H.264
streams. Enables automatic recognition of the h264 format for the .264
extension.

Signed-off-by: Werner Robitza <werner.robitza@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-22 23:13:08 +01:00
Michael Niedermayer
e32b07aea4 avformat/mov: Stricter sanity checks on the display_matrix 
Fixes "broken" tkhd
Found-by: koda
Tested-by: koda
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-22 19:52:52 +01:00
Michael Niedermayer
b942a71eaa avformat/flvenc: accept AVMEDIA_TYPE_SUBTITLE instead of DATA for subtitles 
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-22 13:26:29 +01:00
Michael Niedermayer
b7f8e6dd8c Merge commit '3a724a7f3b' 
* commit '3a724a7f3b':
  dashenc: Use inttypes.h macros for format strings instead of %lld

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-22 12:06:47 +01:00
Rodger Combs
89684883af avformat/dashenc: fix format string generation 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-22 11:55:21 +01:00
Martin Storsjö
3a724a7f3b dashenc: Use inttypes.h macros for format strings instead of %lld 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-01-22 08:49:41 +02:00
Rodger Combs
1d8aa23794 dashenc: Fix format string generation 
Previously this always used the "lld" format for all parameters,
not only time parameters.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-01-22 08:49:39 +02:00
Brian Brice
f845ae0c8e librtmp: Allow changing the socket send buffer size 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-21 22:24:28 +01:00
Christophe Gisquet
9a9b088d9e libavformat/img2dec: fix warning when !HAVE_GLOB 
Variables are unused in this case.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-21 21:51:28 +01:00
Michael Niedermayer
ea3fc9fe68 smoothstreamingenc: Add a missing "goto fail" 
This goto wasn't necessary originally, but it should have been
added when the write_manifest call was added in 8e276378.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-01-19 22:31:08 +02:00
Mark Reid
b396914c68 libavformat/mxfdec.c: support demuxing opatom audio without index 
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 22:02:58 +01:00
Michael Niedermayer
65b83ce01b avformat/rmdec: Check the return value of av_get_packet() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 20:55:49 +01:00
Michael Niedermayer
8d7ce5cdb7 avformat/nsvdec: Check the return value of av_get_packet() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-18 20:53:25 +01:00
Clément Bœsch
14f3e8b821 avformat/sbgdec: remove double ;; 2015-01-18 00:36:56 +01:00
Michael Niedermayer
ab161bfa4b avformat/asfdec: Check the av_get_packet() return value 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-17 20:40:21 +01:00
Michael Niedermayer
4adf75cade avformat/rtpdec_hevc: Fix 2 "may be used uninitialized in this function" warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-17 20:40:21 +01:00
Michael Niedermayer
edf1cb7aee avformat/nsvdec: Check av_get_packet() return value 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-17 16:27:18 +01:00
Michael Niedermayer
2d0440f93f Merge commit '3941df5462' 
* commit '3941df5462':
  aea: Return proper error code on invalid header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-16 14:20:37 +01:00
Nidhi Makhijani
3941df5462 aea: Return proper error code on invalid header 2015-01-16 10:35:02 +01:00
Anshul Maheshwari
a47c9331ef avformat: Improve data streams/codec support 
This adds data codec/stream handling where previously there was only
audio/video/subtitles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-16 02:24:08 +01:00
Michael Niedermayer
b0be6d8385 avformat/id3v2: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 17:09:39 +01:00
Michael Niedermayer
6e69bf4a7e Merge commit '024e5a2d5f' 
* commit '024e5a2d5f':
  rtmppkt: Repeat the full 32 bit timestamp for chunking continuation packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 14:45:29 +01:00
Michael Niedermayer
eb215be9ce Merge commit '54bc15d5eb' 
* commit '54bc15d5eb':
  id3v2: fix reading v2.2 attached pictures

Conflicts:
	libavformat/id3v2.c

See: 05c3c568dc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 13:01:40 +01:00
Michael Niedermayer
24c76bae5f Merge commit '932788be5a' 
* commit '932788be5a':
  id3v2: add names to the parameters of ID3v2EMFunc.read

Conflicts:
	libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 12:53:53 +01:00
Michael Niedermayer
7eef45a76f avformat/id3v2: Fix incompatible pointer type warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 12:46:13 +01:00
Michael Niedermayer
06ec2f1d32 Merge commit '8809c974a3' 
* commit '8809c974a3':
  id3v2: constify the 'tag' parameter to special metadata parsing callback

Conflicts:
	libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 12:45:20 +01:00
Martin Storsjö
024e5a2d5f rtmppkt: Repeat the full 32 bit timestamp for chunking continuation packets 
This fixes sending chunked packets (packets larger than the output
chunk size, which often can be e.g. 4096 bytes) with a timestamp delta
(or absolute timstamp, if it's a timestamp step backwards, or the
first packet of the stream) larger than 0xffffffff.

The RTMP spec explicitly says (in section 5.3.1.3.) that packets of
type 3 (continuation packets) should include this field, if the
previous non-continuation packet had it included.

The receiving code handles these packets correctly.

Pointed out by Cheolho Park.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2015-01-15 10:20:18 +02:00
Michael Niedermayer
cc18ea8de0 avformat/mov: Do not set aspect ratios that would contain zeros 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 04:26:16 +01:00
Michael Niedermayer
47795505ac avformat/mov: rewrite aspect from matrix code 
The original code was intended purely for rotation == 0
In cf70ba37ba the condition was
changed to use it only for rotation != 0
which broke the cases for which it was intended to be used
as well as breaking cases for which it was not intended to be
used.
This changes the code so it could work for the more general
case and fixes the regressions
If you have sample files that are not handled correctly
please open tickets or mail me!

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 04:22:00 +01:00
Michael Niedermayer
89b6382bec Merge commit 'cf70ba37ba' 
* commit 'cf70ba37ba':
  mov: Check angle rather than full matrix when updating SAR

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 04:00:51 +01:00
Anton Khirnov
54bc15d5eb id3v2: fix reading v2.2 attached pictures 
In v2.2, the picture type is not a zero-terminated string, but has a
constant size of 3 bytes.
 2015-01-14 17:17:24 +01:00
Anton Khirnov
932788be5a id3v2: add names to the parameters of ID3v2EMFunc.read 
Some of them are not immediately obvious.
 2015-01-14 17:17:24 +01:00
Anton Khirnov
8809c974a3 id3v2: constify the 'tag' parameter to special metadata parsing callback 
Those functions should not ever modify it.
 2015-01-14 17:17:24 +01:00