generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
69,985 Commits 24 Branches 241 Tags 173 MiB
d44e0d8b93
Commit Graph

220 Commits

Author SHA1 Message Date
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
Anton Khirnov
05e59135b3 nutdec: do not set has_b_frames 
It is not supposed to be set by demuxers.
 2014-11-06 09:05:37 +01:00
Michael Niedermayer
42316907b8 Merge commit 'af7ca6ea124b82b337a6b96e10963e88eba57ebe' 
* commit 'af7ca6ea124b82b337a6b96e10963e88eba57ebe':
  nutdec: check av_new_packet return value

Conflicts:
	libavformat/nutdec.c

See: bb502411dd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-22 00:26:37 +02:00
Vittorio Giovara
af7ca6ea12 nutdec: check av_new_packet return value 
CC: libav-stable@libav.org
Bug-Id: CID 733713
 2014-10-21 14:37:48 +01:00
Michael Niedermayer
5753d96771 Merge commit '96bfb677478514db73d1b63b4213c97ad4269e8f' 
* commit '96bfb677478514db73d1b63b4213c97ad4269e8f':
  nutdec: Prevent a memory corruption

Conflicts:
	libavformat/nutdec.c

See: 05dd5368a9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-20 22:35:37 +02:00
Luca Barbato
96bfb67747 nutdec: Prevent a memory corruption 
Chapters do not have an event_flags field.

Bug-Id: CID 1231990
 2014-10-20 10:47:03 +01:00
Michael Niedermayer
05dd5368a9 avformat/nutdec: always initialize event_flags 
Fixes: CID1231990

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-20 16:45:08 +02:00
Michael Niedermayer
1110a030c7 Merge commit 'fa3a5dd4dea34baa6bb2f7fe6006fc4b2888f2aa' 
* commit 'fa3a5dd4dea34baa6bb2f7fe6006fc4b2888f2aa':
  nutdec: update AVFormatContext.event_flags with STREAM_/METADATA_UPDATED whenever metadata changes.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-13 23:44:53 +02:00
Andrew Stone
fa3a5dd4de nutdec: update AVFormatContext.event_flags with STREAM_/METADATA_UPDATED whenever metadata changes. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-08-13 16:23:36 +00: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
a26ecba075 Merge commit '52a1c32c0a86e84d43f977c5148e62975a0c6917' 
* commit '52a1c32c0a86e84d43f977c5148e62975a0c6917':
  nut: Use nut->version in the version range check

Conflicts:
	libavformat/nutdec.c

Note, this bug did not affect ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 21:18:36 +02:00
Luca Barbato
52a1c32c0a nut: Use nut->version in the version range check 
It was wrongly left unchanged when the version field had been
introduced. (c94e2e85cb)
 2014-07-08 19:04:09 +02:00
Michael Niedermayer
a981d1b6aa avformat/nutdec: if all else fails try to lookup video tag in isom 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-07-08 16:37:06 +02:00
Michael Niedermayer
74bd039f8c avformat/nutdec: improve probe speed by 30% 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-24 18:40:40 +02:00
Michael Niedermayer
6b041cb617 avformat/nutdec: Fix handling of older 4.0 files 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-29 01:48:02 +02:00
Michael Niedermayer
a8499cbbe8 Merge commit 'c94e2e85cb6af8a570d8542a830556243bd32873' 
* commit 'c94e2e85cb6af8a570d8542a830556243bd32873':
  nut: Support experimental NUT 4 features

Conflicts:
	doc/nut.texi
	libavformat/nut.h
	libavformat/nutdec.c
	libavformat/nutenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-05-29 01:13:59 +02:00
Luca Barbato
c94e2e85cb nut: Support experimental NUT 4 features 
Add the low overhead pipe mode and the extended broadcast mode.
Export the options as 'syncponts' since it impacts only that.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-05-28 22:04:56 +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
Michael Niedermayer
7f9697aa11 avformat/nutdec: fix packet end clearing 
The code was buggy, using the wrong variable, also it missed the case
where the packet become smaller due to sidedata/metadata being extracted
which left a few bytes uninitialized

Fixes use of uninitialized memory
Fixed: msan_uninit-mem_7f6abbe44530_6838_mewmew_vorbis_ssa.nut
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-10 00:34:15 +01:00
Michael Niedermayer
71fe97a60a avformat/nutdec: check avio_read() return code 
Fixes use of uninitialized memory
Fixes: msan_uninit-mem_7f2785ab8669_6838_mewmew_vorbis_ssa.nut
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-07 00:26:33 +01:00
Michael Niedermayer
d04aceb7d0 avformat/nutdec: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-05 17:27:23 +01:00
Michael Niedermayer
8113e838a8 avformat/nut: add support for per frame side & meta data with version 4 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-01-04 14:13:31 +01:00
Michael Niedermayer
0cedc6c066 avformat/nutdec: use ff_get_extradata() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-25 17:38:29 +01:00
Michael Niedermayer
804ea14b35 avformat/nut: add minor_version field with version>=4 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-25 02:03:19 +01:00
Michael Niedermayer
6aa50374bf avformat/nut: store version in the context 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-12-25 02:03:08 +01:00
Derek Buitenhuis
b1fcdc08ce nut: Fix unchecked allocations 
CC: libav-stable@libav.org
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-22 17:09:56 +01:00
Derek Buitenhuis
55ae13e3de nut: Fix unchecked allocations 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-22 17:08:10 +01:00
Paul B Mahol
a807c68253 avformat: use ff_alloc_extradata() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-13 20:13:38 +00:00
Paul B Mahol
269845db86 avformat/nutdec: check for allocation failures 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-11 15:04:08 +00:00
Michael Niedermayer
7f25050289 nutdec: use ff_find_last_ts() 
Fixes finding the duration for nut files that are truncated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-06 22:27:35 +02:00
Michael Niedermayer
9818bbde53 Merge commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe' 
* commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe':
  nut: use meaningful error values
  FATE: use a less ambiguous end time for filter-trim-time test

Conflicts:
	libavformat/nutdec.c
	tests/fate/filter-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-08 12:47:54 +02:00
Luca Barbato
e0c53c3408 nut: use meaningful error values 
Fix the mispresented EINVAL for EOF on partial files, among the other.
 2013-05-07 14:37:32 +02:00
Michael Niedermayer
77c85cbd9d Merge commit '46c1917350f58dfab84e41919e6c02d43950db8c' 
* commit '46c1917350f58dfab84e41919e6c02d43950db8c':
  nut: use a define for the nut version
  bgmc: Do not mark ff_bgmc_decode_init() as av_cold

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-06 10:41:43 +02:00
Luca Barbato
46c1917350 nut: use a define for the nut version 
Ease switching version in the future and make evident why that value.
 2013-05-06 09:14:43 +02:00
Michael Niedermayer
fd68371b07 nutdec: Implement duration parsing for indexed nuts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-02 18:57:29 +02:00
Michael Niedermayer
9bb54bb685 nutdec: more specific return codes for decode_syncpoint() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-04 16:51:21 +01:00
Michael Niedermayer
7ccc0ed6a0 nutdec: print error on invalid/unsupported fourcc style 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-04 16:49:17 +01:00
Diego Biurrun
d8c772de53 nutdec: Always return a value from nut_read_timestamp() 
The function is a callback that is called by ff_gen_search with
a constant stream index.

Avoid a false positive on older gcc version.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-01-15 02:15:09 +01:00
Michael Niedermayer
ebfb738fa4 nutdec: sanity check r_frame_rate 
This fixes files that store a somewhat incorrect value.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-18 14:03:04 +01:00
Michael Niedermayer
076300bf8b Merge commit 'bfe5454cd238b16e7977085f880205229103eccb' 
* commit 'bfe5454cd238b16e7977085f880205229103eccb':
  lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h
  lavf: move "MP3 " fourcc from riff to nut
  fate: vpx: Add dependencies
  fate: Fix wavpack-matroskamode test dependencies
  x86: dsputilenc: port to cpuflags

Conflicts:
	libavformat/internal.h
	libavformat/nut.c
	tests/fate/vpx.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-29 13:45:57 +01:00
Justin Ruggles
bfe5454cd2 lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h 2012-11-28 11:18:49 -05:00
Michael Niedermayer
cd37963684 Merge commit '381dc1a5ec0925b281c573457c413ae643567086' 
* commit '381dc1a5ec0925b281c573457c413ae643567086':
  fate: ac3: Place E-AC-3 tests and AC-3 tests in different groups
  fate: Add shorthands for acodec PCM and ADPCM tests
  avconv: Drop unused function argument from do_video_stats()
  cmdutils: Conditionally compile libswscale-related bits
  aacenc: Drop some unused function arguments
  rtsp: Avoid a cast when calling strtol
  nut: support textual data
  nutenc: verbosely report unsupported negative pts

Conflicts:
	cmdutils.c
	ffmpeg.c
	libavformat/nut.c
	libavformat/nutenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-30 13:52:03 +01:00
Luca Barbato
d4bff9f1ab nut: support textual data 
Plain text (utf8 encoded) data can be muxed and demuxed in nut.
 2012-10-29 12:03:28 +01:00
Michael Niedermayer
73581afe01 nutdec: fix integer overflow 
Fixes CID700575
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 20:45:32 +02:00
Paul B Mahol
bb502411dd nutdec: check return value of av_new_packet() 
Fixes CID733173.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-10-15 17:03:41 +00:00
Michael Niedermayer
82c0055c5e Merge commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520' 
* commit 'b5198a2637b7b45b0049a1d4b386a06f016f2520':
  configure: tms470: add mapping for -mfpu=vfpv3-d16 flag
  configure: recognise Minix as OS
  configure: work around bug in ash shell
  eval-test: make table static const
  lavr: handle clipping in the float to s32 conversion
  nut: support pcm codecs not mapped in avi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-14 14:46:13 +02:00
Michael Niedermayer
db51c65961 Merge commit '1bd442c276e6688b43777a198cad0d7e3a92123f' 
* commit '1bd442c276e6688b43777a198cad0d7e3a92123f':
  nut: prioritize native tags

Conflicts:
	tests/ref/lavfi/crop
	tests/ref/lavfi/crop_scale
	tests/ref/lavfi/crop_scale_vflip
	tests/ref/lavfi/crop_vflip
	tests/ref/lavfi/null
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_crop
	tests/ref/lavfi/pixfmts_hflip
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_pad
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip
	tests/ref/lavfi/scale200
	tests/ref/lavfi/scale500
	tests/ref/lavfi/vflip
	tests/ref/lavfi/vflip_crop
	tests/ref/lavfi/vflip_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-14 14:31:55 +02:00
Luca Barbato
1bd442c276 nut: prioritize native tags 
Use native tags instead of avi ones, simplifies a lot raw video codecs
handling.
 2012-10-13 12:33:18 +02:00
Luca Barbato
92281850a2 nut: support pcm codecs not mapped in avi 
The native tags will be used when available.
 2012-10-13 12:33:18 +02:00