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

55839 commits

This branch
This branch
All branches
Author SHA1 Message Date
Paul B Mahol
d49f2603be truemotion2: check return value of av_malloc(z) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-29 10:46:42 +00:00
Lukasz Marek
f3ace37a3b lavf/ftp: fix possible crash 2013-08-29 01:57:38 +02:00
Michael Niedermayer
c4810fbe4f avformat/utils: fix av_probe_input_buffer2() so it returns the probe score 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 01:15:15 +02:00
Stefano Sabatini
7528fdcda3 doc/APIchanges: add missing entry for av_format_probe_score() function addition 2013-08-29 00:10:34 +02:00
Stefano Sabatini
083f058024 doc/formats: remove probe_score entry, since it's not an option 2013-08-29 00:08:27 +02:00
Michael Niedermayer
e31db621bf avformat: export probe score 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 22:18:57 +02:00
Michael Niedermayer
90411f7ed6 snowenc: Fix memleak of the ratecontrol related memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 20:53:21 +02:00
Michael Niedermayer
f13e733145 avcodec/snow: check for malloc* failures 
Also return and pass on error codes where needed for this

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 17:09:46 +02:00
Michael Niedermayer
129f50692e snowenc: check for memory allocation failures 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 16:52:30 +02:00
Michael Niedermayer
48480da6ad Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  doc: document the asf demuxer

Conflicts:
	doc/demuxers.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 13:03:09 +02:00
Michael Niedermayer
bc6e535db1 Merge commit '0ce1a7598e' 
* commit '0ce1a7598e':
  vf_interlace: fix file permissions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 12:57:09 +02:00
Michael Niedermayer
983ed20c1c Merge commit 'ef51692a49' 
* commit 'ef51692a49':
  Revert "w32pthread: help compiler figure out undeeded code"

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 12:46:12 +02:00
Michael Niedermayer
a8ddafb0f4 Merge commit '4332bf98dc' 
* commit '4332bf98dc':
  w32threads: Don't use function pointers when linking directly to newer APIs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 12:41:16 +02:00
Michael Niedermayer
72196a4b8d Merge commit '310cc4bf82' 
* commit '310cc4bf82':
  smoothstreamingenc: Write to a temp file while updating the manifest

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 12:34:33 +02:00
Michael Niedermayer
7efa9b1794 Merge commit 'b1f9cdc37f' 
* commit 'b1f9cdc37f':
  ac3: Return proper error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 12:28:25 +02:00
Michael Niedermayer
bfa1b42b3c Merge commit '818d1f1a3e' 
* commit '818d1f1a3e':
  ac3: Clean up the error paths

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 12:16:10 +02:00
Michael Niedermayer
f0ee0341b0 Merge commit '6258d362b8' 
* commit '6258d362b8':
  ac3: Do not clash with normal AVERROR

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 12:09:41 +02:00
Michael Niedermayer
946902e5b9 Merge commit 'f4634ae8a8' 
* commit 'f4634ae8a8':
  flv: Fix the help string

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 12:03:06 +02:00
Michael Niedermayer
a13af77f49 Merge commit '21015109ec' 
* commit '21015109ec':
  doc: Document the flv demuxer

Conflicts:
	doc/demuxers.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 11:55:03 +02:00
Michael Niedermayer
87d38ad803 Merge commit 'f812eeda17' 
* commit 'f812eeda17':
  matroskaenc: Fix writing TRACKDEFAULTFLAG

Conflicts:
	libavformat/matroskaenc.c
	tests/fate/wavpack.mak
	tests/ref/lavf/mkv
	tests/ref/seek/lavf-mkv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 11:33:59 +02:00
Luca Barbato
48f2e53ad0 doc: document the asf demuxer 
And drop a typo from the previous FLV entry.
 2013-08-28 11:02:56 +02:00
Michael Niedermayer
70106e73c5 cmdutils: Filter non user AVOptions out from what can be set over the command line. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 00:25:13 +02:00
Vittorio Giovara
0ce1a7598e vf_interlace: fix file permissions 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-08-27 23:50:45 +02:00
Martin Storsjö
ef51692a49 Revert "w32pthread: help compiler figure out undeeded code" 
This reverts commit 4622f11f9c.

The compiler should be able to do the dead code elimination now
without this when the cond_* names point directly to the real
functions instead of to local function pointers.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-27 23:12:49 +03:00
Martin Storsjö
4332bf98dc w32threads: Don't use function pointers when linking directly to newer APIs 
This reduces the call overhead slightly. More noticeably, it
restores the earlier (unintended?) feature that condition variable
functions work just fine even if w32thread_init() hasn't been called.
This was broken as a side effect of 4622f11f9, if explicitly targeting
Vista+.

This makes w32threading work in VP8 again, if targeting Vista+.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-27 23:12:28 +03:00
Martin Storsjö
310cc4bf82 smoothstreamingenc: Write to a temp file while updating the manifest 
If a client tries to read the file while it's being updated, the client
would get an incomplete manifest. Instead write to a separate temp file
and atomically rename it to replace the previous one.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-27 19:44:31 +03:00
Luca Barbato
b1f9cdc37f ac3: Return proper error codes 2013-08-27 16:19:12 +02:00
Luca Barbato
818d1f1a3e ac3: Clean up the error paths 2013-08-27 16:19:12 +02:00
Luca Barbato
6258d362b8 ac3: Do not clash with normal AVERROR 
The parsing function return AVERROR and AAC_AC3_PARSE_ERROR values,
make sure they are not misunderstood.
 2013-08-27 16:19:12 +02:00
Luca Barbato
f4634ae8a8 flv: Fix the help string 2013-08-27 14:38:54 +02:00
Luca Barbato
21015109ec doc: Document the flv demuxer 2013-08-27 14:38:19 +02:00
Alfred E. Heggestad
16c3ed5837 libavutil: cast truncated values to uint32_t 
programs using ffmpeg that are compiled with -Wshorten-64-to-32
gives a warning when using header files common.h and rational.h

cast 64-bit truncated values to (uint32_t) to avoid the warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-27 14:25:34 +02:00
John Stebbins
f812eeda17 matroskaenc: Fix writing TRACKDEFAULTFLAG 
The element was only being written when the value == 1.  But the default
value of this element is 1, so this has no useful effect.  This element
needs to be written when the value == 0.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-27 14:00:31 +02:00
Michael Niedermayer
231201382e Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  movenc: Check for errors from mov_create_chapter_track

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-27 12:52:17 +02:00
Michael Niedermayer
da2038221b Merge commit '2bbad1f94c' 
* commit '2bbad1f94c':
  movenc: Properly free allocated data on failures in mov_write_header

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-27 12:47:04 +02:00
Michael Niedermayer
ef4fcb30c4 Merge commit '3559fb97c4' 
* commit '3559fb97c4':
  movenc: Check that tracks->enc exists before trying to free extradata

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-27 12:33:39 +02:00
Michael Niedermayer
0bd15938ec Merge commit '4d122b01e4' 
* commit '4d122b01e4':
  movenc: Check for allocation failures in mov_create_chapter_track

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-27 12:26:27 +02:00
Martin Storsjö
0fb3e1c6ce movenc: Check for errors from mov_create_chapter_track 
On failures in the write_trailer function, we could also ignore
the errors and try to finish the file despite these errors (which
would only leave an incomplete chapters track). It's probably better
to signal the error clearly to the caller though (and if this
function failed there's no guarantee that there's enough memory to
finish the trailer either).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-27 10:26:10 +03:00
Martin Storsjö
2bbad1f94c movenc: Properly free allocated data on failures in mov_write_header 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-27 10:26:08 +03:00
Martin Storsjö
3559fb97c4 movenc: Check that tracks->enc exists before trying to free extradata 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-27 10:26:07 +03:00
Martin Storsjö
4d122b01e4 movenc: Check for allocation failures in mov_create_chapter_track 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-27 10:25:55 +03:00
Michael Niedermayer
535d9a9386 avformat/ftp: make const tables static const 
Reviewed-by: Lukasz M <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-27 03:55:45 +02:00
Paul B Mahol
b74213db08 wavpackenc: remove duplicate 'const' declaration specifier 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-26 19:30:45 +00:00
Paul B Mahol
e6e26b8a91 msrledec: use memset() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-26 19:26:01 +00:00
Paul B Mahol
6638738968 msrledec: use bytestream2_get_bufferu() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-26 19:26:00 +00:00
Paul B Mahol
f12c27daf7 sgidec: use bytestream2_get_bufferu() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-26 19:26:00 +00:00
Michael Niedermayer
fcaf5fa2ea avcodec/fft-test: put ff_dct* code under CONFIG_DCT 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-26 20:39:22 +02:00
Michael Niedermayer
ffdbec6fc9 tests/fate/libavcodec: fate-idct8x8 needs dct 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-26 20:37:31 +02:00
Michael Niedermayer
0617efa7f7 tests/fate/fft: add mdct dependency as mdct is used too 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-26 20:36:35 +02:00
Michael Niedermayer
e29c29e10a tests/fate/cover-art: add file protocol & rawvideo muxer dependency 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-26 20:35:57 +02:00