summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-16
|\ | | | | | | | | | | | | * qatar/master: aacdec: Lower the number of frames required to detect ADTS Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacdec: Lower the number of frames required to detect ADTSMartin Storsjö2014-03-16
| | | | | | | | | | | | | | | | | | | | | | For live audio streams, requiring 500 frames for a stream to be detected is a bit overkill. This allows live ADTS streams that don't start nicely at a frame boundary to start up more quickly, e.g. http://mp3.streampower.be/radio1.aac. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0412cb67cda05b08dfca6bfc4ff664ea917fa932'Michael Niedermayer2014-03-16
|\| | | | | | | | | | | | | * commit '0412cb67cda05b08dfca6bfc4ff664ea917fa932': aacdec: Don't count probed ADTS frames if there are false positives Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacdec: Don't count probed ADTS frames if there are false positivesMartin Storsjö2014-03-16
| | | | | | | | | | | | | | | | | | If a portion of the probe buffer seem to resemble ADTS frames, but some data at the end is a mismatch, disregard the whole probing attempt. If it actually is ADTS data, there shouldn't be any mismatches within the sequential frame data. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Phantom Cine demuxer (iteration 2014.3)Peter Ross2014-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: omit avformat ident from isml_manifest for bitexact modeMichael Niedermayer2014-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: omit LIBAVCODEC_IDENT for bitexact mode from uuidusmt_tagMichael Niedermayer2014-03-16
| | | | | | | | | | | | This code is apparently not tested by fate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: only ommit encoder tag of the metadata for bitexact modeMichael Niedermayer2014-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/isom: fix mix of declaration and statementMichael Niedermayer2014-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8f629a986c46f227abda1811a6ad1f449871ca35'Michael Niedermayer2014-03-16
|\| | | | | | | | | | | | | * commit '8f629a986c46f227abda1811a6ad1f449871ca35': isom: convert mp4 dvdsub extradata to vobsub format Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * isom: convert mp4 dvdsub extradata to vobsub formatwm42014-03-15
| | | | | | | | | | | | | | | | | | | | | | | | mp4 files embedding DVD subtitles do not use the same extradata format as the rest of Libav expects. The subtitle decoder in libavcodec in particular does not understand this format. Convert the extradata to the vobsub .idx format. mp4 stores the palette as binary 32 bit ints in YUV. The subtitle resolution is stored separately in the track header, which we access through AVStream. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avformat/id3v2: decode compilation metadataPeter Ross2014-03-15
| | | | | | | | | | | | | | Described http://id3.org/iTunes%20Compilation%20Flag Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: encode compilation metadataPeter Ross2014-03-15
| | | | | | | | | | | | | | Fixes ticket #2960. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: decode compilation metadataPeter Ross2014-03-15
| | | | | | | | | | | | | | This flag is known as 'Part of a compilation' in Apple iTunes. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-14
|\| | | | | | | | | | | | | | | | | | | * qatar/master: aac: K&R formatting cosmetics Conflicts: libavformat/aacdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aac: K&R formatting cosmeticsLuca Barbato2014-03-14
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-13
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: Match stream id Conflicts: cmdutils.c doc/fftools-common-opts.texi See: ea07063fd82686af3fabb45e5ed10aa48d084d61 Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | mvformat/movenc: fix IMXMichael Niedermayer2014-03-13
| | | | | | | | | | | | | | fixes Ticket3351 Tested-by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-12
|\| | | | | | | | | | | | | * qatar/master: http: Properly initialize icy headers string Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * http: Properly initialize icy headers stringAlessandro Ghedini2014-03-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The icy_metadata_headers string never gets initialized, so, during the first call to av_strlcatf() in parse_icy(), strlen() will be called on a pointer to uninitialized memory. At best this causes some garbage data to be left at the start of the string. By initializing icy_metadata_headers to the empty string, the first call to strlen() will always return 0, so that data is appended from the start of the string. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'e77a2ea9505863e50bf013706f66bf8b7325e524'Michael Niedermayer2014-03-12
|\| | | | | | | | | | | | | * commit 'e77a2ea9505863e50bf013706f66bf8b7325e524': http: Declare more parameters as const where possible Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * http: Declare more parameters as const where possibleMartin Storsjö2014-03-12
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat: extracting NTP timestamp from RTCPFred Rothganger2014-03-12
| | | | | | | | | | | | | | | | For muxing, it accepts both 0 and AV_NOPTS_VALUE. For demuxing, it will present AV_NOPTS_VALUE when start_time_realtime is unknown. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: rescale when copying duration to timecode trackBryce McLeod2014-03-12
| | | | | | | | | | | | Fixes Ticket3453 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-03-12
|\ \ | | | | | | | | | | | | | | | | | | * cehoyos/master: Revert "Allow stream-copying grayscale mov files." Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | Revert "Allow stream-copying grayscale mov files."Carl Eugen Hoyos2014-03-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 691dec62011fe9993809fbc793126b40cac0c584. The commit did not fix ticket #3215, it was fixed one commit earlier. The revert may break other use-cases but they should be fixed differently, the offending commit introduced too many problems. Fixes ticket #3377. Fixes ticket #3378.
* | | avformat: revert %c changes from d92024f18fa3d69937cb2575f3a8bf973df02430Michael Niedermayer2014-03-12
| | | | | | | | | | | | | | | Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-03-12
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: http: Allow setting a Content-Type for POST requests Conflicts: libavformat/http.c See: c01d1d4ddf4d8240427341af1c077f6455243576 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | http: Allow setting a Content-Type for POST requestsClément Bœsch2014-03-11
| | | | | | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * | http: Improve options descriptionsAlessandro Ghedini2014-03-11
| | | | | | | | | | | | | | | | | | Add documentation where missing. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | | Merge commit 'ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab'Michael Niedermayer2014-03-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab': http: Always allow no-op seek Conflicts: libavformat/http.c See: 857841c1b63bf3ffacef03da2bd6275d55ead769 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | http: Always allow no-op seekAnssi Hannula2014-03-11
| | | | | | | | | | | | | | | | | | This also allows checking stream position as per ffurl_seek() doxy. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | | Merge commit '2ec33d27127251bbc45e1f88e60691ad59cf2319'Michael Niedermayer2014-03-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2ec33d27127251bbc45e1f88e60691ad59cf2319': http: Add support for selecting a request range Conflicts: doc/protocols.texi libavformat/http.c See: d52882faef368264f9fe5a595274ec84d3446132 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | http: Add support for selecting a request rangeAnssi Hannula2014-03-11
| | | | | | | | | | | | | | | | | | Comment from Reimar Döffinger included as pro memoria. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | | Merge commit 'ddfc98906373d1f17f6205cedd14c68d7a75995f'Michael Niedermayer2014-03-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ddfc98906373d1f17f6205cedd14c68d7a75995f': http: Support setting custom User-Agent Conflicts: doc/protocols.texi libavformat/http.c See: 2bb1c713cc7e8fd018a3a0b579145a31a1c47bce Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | http: Support setting custom User-AgentClément Bœsch2014-03-11
| | | | | | | | | | | | | | | | | | | | | Contextually make the default User-Agent use the common "Name/Version" pattern. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | | Merge commit 'e58c85b0686892960042232e51c77168b264838a'Michael Niedermayer2014-03-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e58c85b0686892960042232e51c77168b264838a': http: Export Content-Type information Conflicts: doc/protocols.texi libavformat/http.c See: 76d851b65619e5a0fe4cc5248a6858287fe890b4 See: 20899c54f03c413b225e8839a3c5318ab47abe55 See: 255ec768da6f6e821775888621da2156764598da Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | http: Export Content-Type informationMichael Niedermayer2014-03-11
| | | | | | | | | | | | | | | | | | Bug-Id: https://bugs.debian.org/740421 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | | Merge commit '8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab'Michael Niedermayer2014-03-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab': http: Add support reading ICY metadata Conflicts: doc/protocols.texi libavformat/http.c See: a92fbe16f2dc118c0d3adc222484268831388648 See: 636273d3d4a8c42f51832e8bf83e566e875916bf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | http: Add support reading ICY metadataLuca Barbato2014-03-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Export the metadata as a icy_metadata_packet avoption. Based on the work of wm4 and Alessandro Ghedini. Bug-Id: https://bugs.debian.org/739936 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | | Merge commit '4ff99ab3d7d5576e99e6b8a411b4a44500ed88fa'Michael Niedermayer2014-03-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4ff99ab3d7d5576e99e6b8a411b4a44500ed88fa': http: Refactor process_line Conflicts: libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | http: Refactor process_lineLuca Barbato2014-03-11
| | |
* | | Merge commit '7a2fddb4480121712df560cf619c1c3566cae3ff'Michael Niedermayer2014-03-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7a2fddb4480121712df560cf619c1c3566cae3ff': http: K&R formatting cosmetics Conflicts: libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | http: K&R formatting cosmeticsLuca Barbato2014-03-11
| | |
* | | Merge commit '78b21c1d7177e1d61ad3c9225f67699da089aa7c'Michael Niedermayer2014-03-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '78b21c1d7177e1d61ad3c9225f67699da089aa7c': http: Drop doxy comments Conflicts: libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | http: Drop doxy commentsLuca Barbato2014-03-11
| | |
* | | Merge commit '55a215ba63d9fa79cd7ee265ee2e777ee86b200c'Michael Niedermayer2014-03-12
|\| | | | | | | | | | | | | | | | | | | | * commit '55a215ba63d9fa79cd7ee265ee2e777ee86b200c': http: Return meaningful error codes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | http: Return meaningful error codesLuca Barbato2014-03-11
| | |
* | | Merge commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf'Michael Niedermayer2014-03-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf': avformat: Report the duration analysis reached Conflicts: libavformat/utils.c See: 8529f9b36b7c1b8f2cb36ba2709983517c4b6458 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | avformat: Report the duration analysis reachedLuca Barbato2014-03-11
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-07 13:10:20 +0000