generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
66,009 Commits 24 Branches 241 Tags
Commit Graph

15711 Commits

Author SHA1 Message Date
Roman Savchenko
3d90f27ad5 avformat_new_stream: make the AVCodec parameter const 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-07-08 08:24:27 +00:00
Michael Niedermayer
b8d017adba avformat/segment: simplify localtime* use 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 22:57:36 +02:00
Deti fliegl
8cda23f341 avformat/segment: Support cutting at clocktime 
Signed-off-by: Deti fliegl <fliegl@baycom.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-07 22:56:55 +02:00
Michael Niedermayer
a863c97e99 smoothstreamingenc: Fix a memory leak on errors 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-07-07 22:08:42 +03:00
Michael Niedermayer
d95a04547a Merge commit '77fc7b76726719746ca45df6c4a62c41abad506e' 
* commit '77fc7b76726719746ca45df6c4a62c41abad506e':
  vc1test: Return proper error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 19:25:12 +02:00
Michael Niedermayer
1c8c4b8a89 Merge commit '865461099e062de5a3a109c2a5be98004c11d8bd' 
* commit '865461099e062de5a3a109c2a5be98004c11d8bd':
  librtmp: Don't free the temp url at the end of rtmp_open

Conflicts:
	libavformat/librtmp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 19:12:52 +02:00
Nidhi Makhijani
02a7a5e330 vc1test: Check malloc call 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-07-06 09:25:52 -07:00
Nidhi Makhijani
77fc7b7672 vc1test: Return proper error codes 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-07-06 07:53:58 -07:00
Martin Storsjö
865461099e librtmp: Don't free the temp url at the end of rtmp_open 
librtmp can keep pointers to this string internally, and may
use them at shutdown as well.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-07-06 17:49:02 +03:00
Michael Niedermayer
a53c5d454e avformat/smoothstreamingenc: fix memleak 
Fixes CID1224285
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-06 05:02:38 +02:00
Carl Eugen Hoyos
d919fdd4f7 Do not detect jp2 images as mov files. 2014-07-05 02:11:17 +02:00
Lukasz Marek
b7adc5b5a6 lavf/libssh: call ssh_userauth_none before ssh_userauth_list 
According to doc, ssh_userauth_none must be called before ssh_userauth_list.
It solves login issue for new versions of libssh.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 20:30:48 +02:00
Michael Niedermayer
d1a8659efe avformat/img2dec: remove functions from image pipe which are unneeded for image pipes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 16:44:40 +02:00
Michael Niedermayer
c277ab6b78 avformat/img2dec: improve bmp probe 
fix probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 04:54:52 +02:00
Michael Niedermayer
d36fe733c1 avformat/img2dec: increase probe buffer to 2k 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 04:54:32 +02:00
Michael Niedermayer
0437445926 avformat/img2dec: set AVProbeData size correctly on corner cases of tiny files 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 04:00:27 +02:00
Michael Niedermayer
6691eee48c avformat/img2dec: avoid seekback on probeing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 04:00:27 +02:00
Michael Niedermayer
726e253b00 avformat/img2dec: allocate and clear padding area for probe correctly 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 04:00:27 +02:00
Michael Niedermayer
7d179b126b Merge remote-tracking branch 'lukaszmluki/master' 
* lukaszmluki/master:
  lavf/ftp: always treat all response codes >= 500 as error
  lavf/ftp: explicitly enable UTF-8
  lavf/ftp: make response parsing more RFC compliant

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 02:19:07 +02:00
Carl Eugen Hoyos
4c145b692c Autodetect JPEG2000 imagess. 
Autodetection of jp2 files does not work yet, the files are detected
as mov.
 2014-07-04 02:10:26 +02:00
Lukasz Marek
c82521713d lavf/ftp: always treat all response codes >= 500 as error 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-07-04 01:21:08 +02:00
Lukasz Marek
a0358db323 lavf/ftp: explicitly enable UTF-8 
Most FTP servers enable UTF-8 by default, but it is not required by the standard.
Enabling it manually makes ffmpeg implementation more consistent when server
doesn't enable it by default.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-07-04 01:21:08 +02:00
Lukasz Marek
3ba6dce48d lavf/ftp: make response parsing more RFC compliant 
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
 2014-07-04 01:21:08 +02:00
Michael Niedermayer
b28fcbba0c Merge commit '9279826008b80daad7446950a821f32033ccd33f' 
* commit '9279826008b80daad7446950a821f32033ccd33f':
  id3v2enc: use a case-insensitive comparison for APIC picture type

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-04 00:50:40 +02:00
Michael Niedermayer
a9ce5d92e6 Merge commit '0955e57ad07640574fc20ce0bea3c0b83982ada1' 
* commit '0955e57ad07640574fc20ce0bea3c0b83982ada1':
  daud: split muxer and demuxer

Conflicts:
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 21:42:16 +02:00
Anton Khirnov
9279826008 id3v2enc: use a case-insensitive comparison for APIC picture type 2014-07-03 18:40:37 +00:00
Nidhi Makhijani
0955e57ad0 daud: split muxer and demuxer 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-07-03 10:46:11 -07:00
Carl Eugen Hoyos
d538dd824e avformat: Add image3 demuxers with format autodetection 
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 18:14:06 +02:00
James Zern
dea377fcc0 ivfenc: support VP9 
libvpx tools accept vp9 ivf files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 15:46:26 +02:00
Michael Niedermayer
a3c479fc49 avformat/avformat: minor grammar improvement 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 13:51:53 +02:00
Michael Niedermayer
44f079b27e Merge commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b' 
* commit 'cdab9db2adeec46b3984309c8c651bdd737d2b6b':
  lavf: document av_dump_format()

Conflicts:
	libavformat/avformat.h

See: 61f96be08a66e74897406fd64da4e61ea4b6a8c5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-03 13:39:23 +02:00
Vittorio Giovara
cdab9db2ad lavf: document av_dump_format() 2014-07-02 23:37:21 -04:00
Carl Eugen Hoyos
b02cfad7d2 Fix standalone compilation of the wtv muxer. 2014-07-02 23:41:29 +02:00
Michael Niedermayer
98569d8963 matroskadec: Fix a double negation typo 
This typo has existed since this code was added in c16582579.
Newer versions of clang pointed out that this comparison always
was true (since the result of the negation is either 0 or 1, while
AVDISCARD_ALL has the value 48).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-07-02 20:15:42 +03:00
Michael Niedermayer
141ee10913 Merge commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4' 
* commit '48e6432407a73d5006d84609456e6e0bc3dd8fc4':
  matroska: Factor out mkv_write_stereo_mode

Conflicts:
	libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 20:55:42 +02:00
Michael Niedermayer
ee78b0c252 Merge commit 'b75a1f9892b5b715397edbf837e4d4cda337907b' 
* commit 'b75a1f9892b5b715397edbf837e4d4cda337907b':
  matroska: Factor out write_track from mkv_write_tracks

Conflicts:
	libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 20:25:35 +02:00
Michael Niedermayer
8365287e61 Merge commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e' 
* commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e':
  matroska: K&R formatting cosmetics

Conflicts:
	libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 19:58:57 +02:00
Luca Barbato
48e6432407 matroska: Factor out mkv_write_stereo_mode 2014-07-01 16:43:20 +02:00
Luca Barbato
b75a1f9892 matroska: Factor out write_track from mkv_write_tracks 2014-07-01 16:43:01 +02:00
Luca Barbato
f1f6156b3f matroska: K&R formatting cosmetics 2014-07-01 16:42:32 +02:00
Michael Niedermayer
fb318def5d Merge commit '20f95f21f9b9595608ba668a6eca78f2d508be67' 
* commit '20f95f21f9b9595608ba668a6eca78f2d508be67':
  mov: Support default-base-is-moof.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-01 16:31:57 +02:00
Yusuke Nakamura
20f95f21f9 mov: Support default-base-is-moof. 
default-base-is-moof shall be set to track fragments compatible with DASH
Media Segments. So, this is a fundamental support for ISOBMFF ver. DASH.
This is meaningful only when base-data-offset-present is absent and two or
more track fragments are present in a movie fragment.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2014-07-01 14:36:06 +03:00
Michael Niedermayer
f054d1e7ae avformat/hdsenc: Use av_mallocz_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-30 05:08:33 +02:00
Michael Niedermayer
ca384d708b avformat/rtsp: use av_malloc_array() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-30 05:08:16 +02:00
Michael Niedermayer
e6aba1be4c avformat/options_table: Fix flush_packet flag flags 
Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-28 21:24:15 +02:00
Michael Niedermayer
c599c211fb avformat/mux: fix flush_packets flag with flushing buffers 
Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-28 21:23:32 +02:00
Michael Niedermayer
823ea19a74 Merge commit '39975acc699c83af0a87a7318c0f41e189142938' 
* commit '39975acc699c83af0a87a7318c0f41e189142938':
  rtpenc_jpeg: check for color_range too

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-28 12:40:01 +02:00
Vittorio Giovara
39975acc69 rtpenc_jpeg: check for color_range too 2014-06-28 01:51:14 -04:00
Gaullier Nicolas
134beb9e02 avformat/mxfenc: rename very recently added option to set/force channelcount in MXF D-10 
Approved-by: Tomas Härdin <tomas.hardin@codemill.se>
Approved-by: tim nicholson <nichot20@yahoo.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-27 03:29:51 +02:00
Michael Niedermayer
af75a85599 Merge commit '3f4edf012593c73941caa0ef9b292da00225c3df' 
* commit '3f4edf012593c73941caa0ef9b292da00225c3df':
  dump_stream: print the timebase as is, do not reduce it

See: 75511c293add07db1cca58dcd8b08c33fc2f1075
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-26 21:03:21 +02:00