virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
72,237 Commits 37 Branches 400 Tags 458 MiB
b3496b4a33
Commit Graph

200 Commits

Author SHA1 Message Date
Michael Niedermayer
3cd6f4546a Merge commit '656e31ed8728b0c095d037dc9764fc8137c87200' 
* commit '656e31ed8728b0c095d037dc9764fc8137c87200':
  ogg: Forward errors further

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 22:12:08 +02:00
Luca Barbato
656e31ed87 ogg: Forward errors further 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-04-20 12:41:33 +02:00
Michael Niedermayer
40d552dae6 Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8' 
* commit '1a3eb042c704dea190c644def5b32c9cee8832b8':
  Replace av_dlog with normal av_log at trace level

Conflicts:
	ffplay.c
	libavdevice/fbdev_dec.c
	libavfilter/avfilter.c
	libavfilter/internal.h
	libavfilter/setpts.c
	libavfilter/src_movie.c
	libavfilter/vf_crop.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fieldorder.c
	libavformat/assdec.c
	libavformat/avidec.c
	libavformat/flvdec.c
	libavformat/http.c
	libavformat/ipmovie.c
	libavformat/isom.c
	libavformat/mov.c
	libavformat/mpegenc.c
	libavformat/mpegts.c
	libavformat/mpegtsenc.c
	libavformat/mux.c
	libavformat/mxfdec.c
	libavformat/nsvdec.c
	libavformat/oggdec.c
	libavformat/r3d.c
	libavformat/rtspdec.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-20 03:19:47 +02:00
Vittorio Giovara
1a3eb042c7 Replace av_dlog with normal av_log at trace level 
This applies to every library where performance is not critical.
 2015-04-19 12:41:59 +01:00
Federico Tomassetti
27aa1ff35a oggdec: Check memory allocation 
Bug-Id: CID 1257798 / CID 1257805

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-03-21 23:18:15 +01:00
Michael Niedermayer
40adcf576f avformat/oggdec: Check for ost allocation failure 
Fixes CID1257798
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-22 19:21:53 +01:00
Michael Niedermayer
9b8152bf04 avformat/oggdec: Check for av_malloc() failure and forward the error code 
Fixes CID1257805

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-22 17:53:35 +01:00
Michael Niedermayer
2924514721 Merge commit '9deaec782810d098bca11c9332fab2d2f4c5fb78' 
* commit '9deaec782810d098bca11c9332fab2d2f4c5fb78':
  lavf: move internal fields from public to internal context

Conflicts:
	libavformat/avformat.h
	libavformat/internal.h
	libavformat/mux.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-11 02:47:54 +01:00
wm4
9deaec7828 lavf: move internal fields from public to internal context 
This is not an API change; the fields were explicitly declared private
before.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-02-10 21:45:04 +01:00
James Almer
430a816859 oggdec: add support for VP8 demuxing 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-12-18 23:27:07 +01:00
wm4
b173f5c155 oggdec: fix invalid free on error 
The read_packet callback passes a pointer to a stack-allocated AVPacket.
Attempting to free it with av_free() makes no sense.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-30 16:38:14 +02:00
Michael Niedermayer
fb33bff990 Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39' 
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39':
  cosmetics: Write NULL pointer equality checks more compactly

Conflicts:
	cmdutils.c
	ffmpeg_opt.c
	ffplay.c
	libavcodec/dvbsub.c
	libavcodec/dvdsubdec.c
	libavcodec/dvdsubenc.c
	libavcodec/dxa.c
	libavcodec/libxvid_rc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/rv10.c
	libavcodec/tiffenc.c
	libavcodec/utils.c
	libavcodec/vc1dec.c
	libavcodec/zmbv.c
	libavdevice/v4l2.c
	libavformat/matroskadec.c
	libavformat/movenc.c
	libavformat/sdp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-15 21:00:50 +02:00
James Almer
d34ec64a22 replace calls to url_feof() with avio_feof() 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-08 00:48:38 +02:00
Michael Niedermayer
466988ab75 Fix dont and doesnt typos 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-27 15:14:32 +02: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
Michael Niedermayer
4ccd7cb45b avformat/oggdec/ogg_read_packet(): factorize failure code path 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-06 18:10:47 +02:00
Michael Niedermayer
c1b24ca762 avformat/oggdec: check for av_packet_new_side_data() failure 
Fixes CID1197062
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-04-06 18:10:47 +02:00
James Almer
313a6c65b7 oggdec: validate VP8 keyframes 
Fixes seeking with broken files

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-24 02:24:21 +01:00
Ben Boeckel
7eb84f2c3b ogg: allow streams to update metadata 
Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-05 22:36:42 +01:00
Michael Niedermayer
5e0c7eab2a avformat/oggdec: dont read timestamps from EOS pages of ogm videos 
Some muxers store invalid timestamps there, which breaks seeking
Fixes Ticket2739

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-04 18:39:42 +01:00
James Almer
d890db5f53 oggdec: add support for VP8 demuxing 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-30 04:05:27 +01:00
Michael Niedermayer
551a679795 avformat/oggdec: reset end_trimming when it has been used, so it cannot be used twice by mistake 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 05:33:21 +01:00
Dale Curtis
9c0dd7b462 avformat/oggdec: reset end_trimming in ogg_reset() 
Fixes the output when seeking back to the start

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-12 05:33:02 +01:00
Michael Niedermayer
6838e1f547 avformat/oggdec: favor av_freep() over av_free() 
Found-by: Reimar Döffinger
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-19 22:50:16 +02:00
Nicolas George
ecab1c7741 oggdec: add support for Opus in Ogg demuxing 2013-10-12 15:25:18 +02:00
Vignesh Venkatasubramanian
23637f98f4 lavf/ogg: Support for end trimming Opus 
Adding support for end trimming Opus embedded in Ogg container.

Signed-Off By: Vignesh Venkatasubramanian <vigneshv@google.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-16 21:42:41 +02:00
Michael Niedermayer
cbe47b1e84 Merge commit 'f369b9356c4606cd4d713d60f7db5de119d901fa' 
* commit 'f369b9356c4606cd4d713d60f7db5de119d901fa':
  avformat: Use av_reallocp_array() where suitable

Conflicts:
	libavformat/asfenc.c
	libavformat/gxfenc.c
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-11 11:23:40 +02:00
Alexandra Khirnova
f369b9356c avformat: Use av_reallocp_array() where suitable 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-09-10 12:38:32 +02:00
Reimar Döffinger
9a27acae9e ogg: Fix potential infinite discard loop 
Seeking in certain broken files would cause ogg_read_timestamp
to fail because ogg_packet would go into a state where all packets
of stream 1 would be discarded until the end of the stream.

Bug-Id: 553
CC: libav-stable@libav.org

Signed-off-by: Jan Gerber <j@v2v.cc>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-08-19 05:20:39 +02:00
Michael Niedermayer
951a365504 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  oggdec: do not fall back on binary search in the generic code.

Conflicts:
	libavformat/oggdec.c
	tests/ref/seek/lavf-ogg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-02 11:50:30 +02:00
Anton Khirnov
8ad3267ce3 oggdec: do not fall back on binary search in the generic code. 
Binary search is already attempted in the format-specific seek function,
so the fallback is only reached if binary search failed already.
 2013-07-02 10:37:22 +02:00
Michael Niedermayer
780b1aa1ef Merge commit 'f963f701d90bd7bb03e39aab4e59bd137084e082' 
* commit 'f963f701d90bd7bb03e39aab4e59bd137084e082':
  ogg: relax demuxer conformance checks

Conflicts:
	libavformat/oggdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-23 13:21:21 +02:00
Luca Barbato
f963f701d9 ogg: relax demuxer conformance checks 
Some samples in the wild are missing headers that are expected by the
specification but in practice do not affect decoding.
 2013-06-22 20:54:59 +02:00
Michael Niedermayer
e278500181 oggdec: Support byte based seeking 
Fixed Ticket2317

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-04 04:04:24 +02:00
Paul B Mahol
a9b424879f lavc & lavf: replace deprecated av_log* functions 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-03-15 18:10:28 +00:00
Michael Niedermayer
5d2f2c7643 oggdec: chained oggs have timestamp discontinuities 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-27 03:46:12 +01:00
Michael Niedermayer
ed37a566c9 oggdec: remove unused variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-21 16:41:50 +01:00
Michael Niedermayer
c74d4658dc oggdec: #if 0 disabled code 
Fixes CID968589
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-21 03:01:53 +01:00
Michael Niedermayer
7cb27d216d oggdec: Support chained streams, support replacing streams in multistream files. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Conflicts:

	Changelog
 2013-01-20 17:53:51 +01:00
Michael Niedermayer
c994bb2fb7 oggdec: Leave treatment of serial changes to the decoder. 
Attempting to re-parse the headers at demuxer level is a
pandora box the way its done currently.

This allows full reconfiguration of vorbis streams

Fixes Ticket2117
Fixes Ticket2121

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-15 20:19:30 +01:00
Michael Niedermayer
c5cf58d4b9 oggdec: resync from the last page. 
Previously we re synced from where we where which cam lead
to loosing pages.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-15 20:19:28 +01:00
Michael Niedermayer
1700be5855 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  oggdec: make sure the private parse data is cleaned up

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 14:20:21 +01:00
Michael Niedermayer
2db8660f09 Merge commit '89b51b570daa80e6e3790fcd449fe61fc5574e07' 
* commit '89b51b570daa80e6e3790fcd449fe61fc5574e07':
  oggdec: free the ogg streams on read_header failure

Conflicts:
	libavformat/oggdec.c

Original commit this was based on: (this merge just moves the function up)
commit 07a866282f
Author: Michael Niedermayer <michaelni@gmx.at>
Date:   Tue Nov 20 15:12:37 2012 +0100

    oggdec: fix memleak on header parsing failure

    Fixes Ticket1931

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 14:03:48 +01:00
Luca Barbato
d894f74762 oggdec: make sure the private parse data is cleaned up 2013-01-06 17:59:54 +01:00
Luca Barbato
89b51b570d oggdec: free the ogg streams on read_header failure 
Plug an annoying memory leak on broken files.
 2013-01-06 17:59:54 +01:00
Michael Niedermayer
ec40d15d82 oggdec: fix warning: assignment discards qualifiers from pointer target type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 22:37:24 +01:00
Michael Niedermayer
d69238e991 Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a' 
* commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a':
  Return proper error code after av_log_ask_for_sample()
  configure: cosmetics: Separate hwaccel dependencies from decoders/encoders
  oggdec: check memory allocation

Conflicts:
	configure
	libavcodec/pictordec.c
	libavformat/anm.c
	libavformat/oggdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 15:09:58 +01:00
Michael Niedermayer
c6664242e0 Merge commit 'f5f1cf52240759208b42477e2157a7b4409ade10' 
* commit 'f5f1cf52240759208b42477e2157a7b4409ade10':
  oggdec: K&R cosmetic formatting
  hlsenc: correctly report target duration

Conflicts:
	libavformat/oggdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-24 14:43:03 +01:00
Luca Barbato
ba064ebe48 oggdec: check memory allocation 2012-12-23 12:19:15 +01:00
Luca Barbato
f5f1cf5224 oggdec: K&R cosmetic formatting 2012-12-23 12:19:08 +01:00