RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
73,950 Commits 36 Branches 398 Tags 232 MiB
Commit Graph

17858 Commits

Author SHA1 Message Date
Michael Niedermayer 40e8ade9eb Merge commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6' 
* commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6':
  asfdec: increment nb_streams right after the stream allocation

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-23 11:43:56 +02:00
Michael Niedermayer cd4c878934 Merge commit 'ee80f834cbb6dbacdc1efb4c658a7d775e82ebff' 
* commit 'ee80f834cbb6dbacdc1efb4c658a7d775e82ebff':
  asfdec: set nb_streams to 0 in the asf_read_close

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-23 11:34:40 +02:00
Alexandra Hájková aed7715b8f asfdec: increment nb_streams right after the stream allocation 
to prevent possible memory leaks

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-23 09:48:26 +02:00
Alexandra Hájková ee80f834cb asfdec: set nb_streams to 0 in the asf_read_close 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-23 09:47:59 +02:00
Michael Niedermayer 3d083f6ffd avformat/dump: Also print pict_type in dump_sidedata() for AV_PKT_DATA_QUALITY_STATS 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 21:04:17 +02:00
Michael Niedermayer c40ecffd31 Replace AV_PKT_DATA_QUALITY_FACTOR by AV_PKT_DATA_QUALITY_STATS 
The stats are a superset of the quality factor, also allowing the picture type and encoder "PSNR" stats to be exported
This also replaces the native by fixed little endian order for the affected side data

AV_PKT_DATA_QUALITY_FACTOR is left as a synonym of AV_PKT_DATA_QUALITY_STATS

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 19:31:52 +02:00
Michael Niedermayer 6b9be608ce Merge commit '2a187a074a7f5ad9f01f72ac9715ddfcb2dbb8ec' 
* commit '2a187a074a7f5ad9f01f72ac9715ddfcb2dbb8ec':
  asfdec: avoid crash in the case when chunk_len is 0 or pkt_len is 0

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 17:13:18 +02:00
Michael Niedermayer fa7defc89a Merge commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd' 
* commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd':
  asfdec: close the demuxer properly when read_header is failing

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 17:06:22 +02:00
Michael Niedermayer fce350be0e Merge commit '5655236a67203d923755f285584c6e68abe7e33f' 
* commit '5655236a67203d923755f285584c6e68abe7e33f':
  asfdec: factor out seeking to the Data Object outside while

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 16:53:26 +02:00
Michael Niedermayer 9837d3b068 avformat/asfdec_f: Parse ECC byte according to spec 
This should not change anything as the spec requires specific values
for the fields, which where handled previously.

Ask for samples when these values do not match

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 14:11:48 +02:00
Alexandra Hájková 2a187a074a asfdec: avoid crash in the case when chunk_len is 0 or pkt_len is 0 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-22 12:11:46 +02:00
Alexandra Hájková 93f16f338f asfdec: close the demuxer properly when read_header is failing 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-22 12:11:46 +02:00
Alexandra Hájková 5655236a67 asfdec: factor out seeking to the Data Object outside while 
return INVALIDDARA if Data Object was not found

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-22 12:11:46 +02:00
Carl Eugen Hoyos 6b2bb3d231 Cosmetics: Reindent after last commit. 2015-07-22 10:25:10 +02:00
Carl Eugen Hoyos 35b33f1a19 lavf/mxfdec: Set codec_tag AVup for Avid 1:1 input. 2015-07-22 10:23:18 +02:00
Michael Niedermayer 0671dc5c53 avformat/asfdec_f: Improve packet resync heuristic 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 01:30:02 +02:00
Michael Niedermayer 5d79a07316 avformat/asfdec_f: Do not print errors if packets do not start with ECC 
There is nothing wrong with such packets, the spec allows this

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 01:21:17 +02:00
Michael Niedermayer 385eb066ce avformat/asfdec_f: Increase the amount of information provided in cases of errors 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-22 01:08:34 +02:00
Zhang Rui 830d3a0ebe avformat/async: rename async_interrupt_callback to async_check_interrupt 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-21 21:19:05 +02:00
Zhang Rui 5e2098d906 avformat/async: fix interrupt_callback usage and return code 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-21 21:18:48 +02:00
Michael Niedermayer f2d7409c72 avformat/async: Add missing else 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-21 17:04:11 +02:00
Zhang Rui aee909acfb fate: add test for async protocol 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-21 15:19:42 +02:00
Michael Niedermayer e5bae39f46 Merge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b' 
* commit '5d3addb937946eca5391e40b5e6308e74ac6f77b':
  Add a quality factor packet side data

Conflicts:
	doc/APIchanges
	ffmpeg.c
	libavcodec/avcodec.h
	libavcodec/mpegvideo_enc.c
	libavcodec/version.h

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-21 00:54:42 +02:00
Vittorio Giovara 5d3addb937 Add a quality factor packet side data 
This is necessary to preserve the quality information currently exported
with coded_frame. Add the new side data to every encoder that needs it,
and use it in avconv.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-07-20 15:06:47 +01:00
Michael Niedermayer cb53db144c avformat/mp3dec: Rename sync() function to avoid build failure on android 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-20 02:41:44 +02:00
Michael Niedermayer bf1fd59c6a avformat/avidec: Fix demuxing avi with broken index 
Fixes: genio-avi

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-20 02:11:49 +02:00
Carl Eugen Hoyos 32d8726a31 lavf/rtpenc_jpeg: Warn if number of present quantization tables is not two. 2015-07-20 00:27:52 +02:00
James Almer 2db8c42ddc avformat/mp3dec: remove unused variable 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-07-19 17:47:28 -03:00
Vesselin Bontchev 0a551cbe97 Add support for Audible AAX (and AAX+) files 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 20:28:39 +02:00
Michael Niedermayer 4df66c7cd6 avformat/mp3dec: split position sync code out 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 19:31:08 +02:00
Michael Niedermayer 3d4297f851 Merge commit 'e61f39849c2e2b7f492c17b42058242ed2fa4d57' 
* commit 'e61f39849c2e2b7f492c17b42058242ed2fa4d57':
  asfdec: make nb_sub to be unsigned int

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 11:52:35 +02:00
Michael Niedermayer 74aba00700 Merge commit '2883ef34b59c9b427c4cfad4620c3235e5778406' 
* commit '2883ef34b59c9b427c4cfad4620c3235e5778406':
  asfdec: read the replicated data in a separate function

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 11:45:08 +02:00
Michael Niedermayer 80a37fc3e1 Merge commit '0989d3ad1fbd7509815208b0a5792918492d2a68' 
* commit '0989d3ad1fbd7509815208b0a5792918492d2a68':
  asfdec: convert condition for the replicated data reading to be safer

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 11:29:55 +02:00
Michael Niedermayer f509c9503a Merge commit '406627287e015ce381795e85e2557b12bf60ca35' 
* commit '406627287e015ce381795e85e2557b12bf60ca35':
  asfdec: do not read replicated data when their length is 0

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-19 11:23:01 +02:00
Alexandra Hájková e61f39849c asfdec: make nb_sub to be unsigned int 
number of subpayloads should be always positive

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-19 09:20:01 +02:00
Alexandra Hájková 2883ef34b5 asfdec: read the replicated data in a separate function 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-19 09:18:27 +02:00
Alexandra Hájková 0989d3ad1f asfdec: convert condition for the replicated data reading to be safer 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-19 09:16:28 +02:00
Alexandra Hájková 406627287e asfdec: do not read replicated data when their length is 0 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2015-07-19 08:59:48 +02:00
Michael Niedermayer b5e716ae13 avformat/mpegtsenc: Add sdt_period, similar to pat_period 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 23:26:05 +02:00
Michael Niedermayer 34da54fd1a avformat/mpegtsenc: Support a user specified PAT/PMT period 
Can be used to fix Ticket3714

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 22:24:25 +02:00
Michael Niedermayer a9c1545a33 avformat/mpegtsenc: support storing PAT/PMT per frame 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 22:19:19 +02:00
Michael Niedermayer a194298954 avformat/movenc: Drop redundant bit exact field from context 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 13:27:33 +02:00
Ganesh Ajjanagadde f6870495e1 avformat: increase first_frames threshold for mp3,ac3 
Fixes Ticket4723

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 04:52:49 +02:00
Zhang Rui f477a3f5ab avformat/async: support filling with a background thread. 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-07-18 01:46:50 +02:00
Vittorio Giovara f1840b070d Revert "mov: Double-check that alias path is not an absolute path" 
This reverts commit 9286de0459.
The change broke support for legit absolute file paths.

Reported-by: Maksym Veremeyenko <verem@m1stereo.tv>.
 2015-07-17 01:44:22 +01:00
Marton Balint c8ec2109f9 avformat: bump micro version after adding concatdec features 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-07-17 00:12:04 +02:00
Marton Balint 5117b5e9aa concatdec: add support for injecting packet metadata 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-07-17 00:12:04 +02:00
Marton Balint 25a6711c25 concatdec: add support for specifying outpoint of files 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-07-17 00:12:04 +02:00
Marton Balint 12d82004c5 concatdec: store eof condition in context 
This is needed later for outpoint support which may leave the last file in a
not-eof state.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-07-17 00:12:04 +02:00
Marton Balint 7ff0137a1f concatdec: add support for specifying inpoint of files 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
 2015-07-17 00:12:04 +02:00