summaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge commit '7f388c0fabc51eca3106e7cc443393269435ab52'Michael Niedermayer2015-07-231-1/+1
|\ \ | |/ | | | | | | | | | | * commit '7f388c0fabc51eca3106e7cc443393269435ab52': asfdec: remove the wrong condition Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * asfdec: remove the wrong conditionAlexandra Hájková2015-07-231-1/+1
| | | | | | | | | | | | | | | | this condition breaks reading from the pipe as data_reached variable have to be set to break while in the asf_read_header just after the Data Object is found Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6'Michael Niedermayer2015-07-231-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6': asfdec: increment nb_streams right after the stream allocation Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * asfdec: increment nb_streams right after the stream allocationAlexandra Hájková2015-07-231-1/+1
| | | | | | | | | | | | to prevent possible memory leaks Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'ee80f834cbb6dbacdc1efb4c658a7d775e82ebff'Michael Niedermayer2015-07-231-0/+1
|\ \ | |/ | | | | | | | | | | * commit 'ee80f834cbb6dbacdc1efb4c658a7d775e82ebff': asfdec: set nb_streams to 0 in the asf_read_close Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * asfdec: set nb_streams to 0 in the asf_read_closeAlexandra Hájková2015-07-231-0/+1
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avformat/dump: Also print pict_type in dump_sidedata() for ↵Michael Niedermayer2015-07-221-1/+1
| | | | | | | | | | | | AV_PKT_DATA_QUALITY_STATS Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Replace AV_PKT_DATA_QUALITY_FACTOR by AV_PKT_DATA_QUALITY_STATSMichael Niedermayer2015-07-221-2/+2
| | | | | | | | | | | | | | | | | | 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>
* | Merge commit '2a187a074a7f5ad9f01f72ac9715ddfcb2dbb8ec'Michael Niedermayer2015-07-221-0/+2
|\ \ | |/ | | | | | | | | | | * 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>
| * asfdec: avoid crash in the case when chunk_len is 0 or pkt_len is 0Alexandra Hájková2015-07-221-0/+2
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd'Michael Niedermayer2015-07-221-3/+8
|\ \ | |/ | | | | | | | | | | * commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd': asfdec: close the demuxer properly when read_header is failing Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * asfdec: close the demuxer properly when read_header is failingAlexandra Hájková2015-07-221-3/+8
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '5655236a67203d923755f285584c6e68abe7e33f'Michael Niedermayer2015-07-221-7/+10
|\ \ | |/ | | | | | | | | | | * commit '5655236a67203d923755f285584c6e68abe7e33f': asfdec: factor out seeking to the Data Object outside while Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * asfdec: factor out seeking to the Data Object outside whileAlexandra Hájková2015-07-221-7/+10
| | | | | | | | | | | | return INVALIDDARA if Data Object was not found Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avformat/asfdec_f: Parse ECC byte according to specMichael Niedermayer2015-07-221-7/+21
| | | | | | | | | | | | | | | | | | 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>
* | Cosmetics: Reindent after last commit.Carl Eugen Hoyos2015-07-221-7/+7
| |
* | lavf/mxfdec: Set codec_tag AVup for Avid 1:1 input.Carl Eugen Hoyos2015-07-223-0/+10
| |
* | avformat/asfdec_f: Improve packet resync heuristicMichael Niedermayer2015-07-221-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/asfdec_f: Do not print errors if packets do not start with ECCMichael Niedermayer2015-07-221-35/+46
| | | | | | | | | | | | There is nothing wrong with such packets, the spec allows this Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/asfdec_f: Increase the amount of information provided in cases of ↵Michael Niedermayer2015-07-221-4/+4
| | | | | | | | | | | | errors Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/async: rename async_interrupt_callback to async_check_interruptZhang Rui2015-07-211-5/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/async: fix interrupt_callback usage and return codeZhang Rui2015-07-211-6/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/async: Add missing elseMichael Niedermayer2015-07-211-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fate: add test for async protocolZhang Rui2015-07-212-1/+173
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b'Michael Niedermayer2015-07-211-0/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Add a quality factor packet side dataVittorio Giovara2015-07-201-0/+3
| | | | | | | | | | | | | | | | 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>
* | avformat/mp3dec: Rename sync() function to avoid build failure on androidMichael Niedermayer2015-07-201-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/avidec: Fix demuxing avi with broken indexMichael Niedermayer2015-07-201-2/+6
| | | | | | | | | | | | Fixes: genio-avi Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/rtpenc_jpeg: Warn if number of present quantization tables is not two.Carl Eugen Hoyos2015-07-201-0/+4
| |
* | avformat/mp3dec: remove unused variableJames Almer2015-07-191-1/+0
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | Add support for Audible AAX (and AAX+) filesVesselin Bontchev2015-07-192-0/+136
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mp3dec: split position sync code outMichael Niedermayer2015-07-191-37/+45
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'e61f39849c2e2b7f492c17b42058242ed2fa4d57'Michael Niedermayer2015-07-191-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'e61f39849c2e2b7f492c17b42058242ed2fa4d57': asfdec: make nb_sub to be unsigned int Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * asfdec: make nb_sub to be unsigned intAlexandra Hájková2015-07-191-1/+1
| | | | | | | | | | | | number of subpayloads should be always positive Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '2883ef34b59c9b427c4cfad4620c3235e5778406'Michael Niedermayer2015-07-191-13/+24
|\ \ | |/ | | | | | | | | | | * commit '2883ef34b59c9b427c4cfad4620c3235e5778406': asfdec: read the replicated data in a separate function Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * asfdec: read the replicated data in a separate functionAlexandra Hájková2015-07-191-13/+24
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '0989d3ad1fbd7509815208b0a5792918492d2a68'Michael Niedermayer2015-07-191-2/+2
|\ \ | |/ | | | | | | | | | | * commit '0989d3ad1fbd7509815208b0a5792918492d2a68': asfdec: convert condition for the replicated data reading to be safer Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * asfdec: convert condition for the replicated data reading to be saferAlexandra Hájková2015-07-191-2/+2
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '406627287e015ce381795e85e2557b12bf60ca35'Michael Niedermayer2015-07-191-11/+13
|\ \ | |/ | | | | | | | | | | * commit '406627287e015ce381795e85e2557b12bf60ca35': asfdec: do not read replicated data when their length is 0 Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * asfdec: do not read replicated data when their length is 0Alexandra Hájková2015-07-191-11/+13
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Revert "mov: Double-check that alias path is not an absolute path"Vittorio Giovara2015-07-171-1/+1
| | | | | | | | | | | | | | This reverts commit 9286de045968ad456d4e752651eec22de5e89060. The change broke support for legit absolute file paths. Reported-by: Maksym Veremeyenko <verem@m1stereo.tv>.
* | avformat/mpegtsenc: Add sdt_period, similar to pat_periodMichael Niedermayer2015-07-181-1/+15
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mpegtsenc: Support a user specified PAT/PMT periodMichael Niedermayer2015-07-181-3/+19
| | | | | | | | | | | | Can be used to fix Ticket3714 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mpegtsenc: support storing PAT/PMT per frameMichael Niedermayer2015-07-181-0/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/movenc: Drop redundant bit exact field from contextMichael Niedermayer2015-07-182-7/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat: increase first_frames threshold for mp3,ac3Ganesh Ajjanagadde2015-07-182-2/+2
| | | | | | | | | | | | | | Fixes Ticket4723 Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/async: support filling with a background thread.Zhang Rui2015-07-183-0/+389
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat: bump micro version after adding concatdec featuresMarton Balint2015-07-171-1/+1
| | | | | | | | | | Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
* | concatdec: add support for injecting packet metadataMarton Balint2015-07-171-0/+28
| | | | | | | | | | Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
* | concatdec: add support for specifying outpoint of filesMarton Balint2015-07-171-4/+25
| | | | | | | | | | Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
OpenPOWER on IntegriCloud