generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
48,326 Commits 24 Branches 241 Tags
Commit Graph

12011 Commits

Author SHA1 Message Date
Clément Bœsch
a1e4e352a6 Add AQTitle subtitles demuxer. 2012-12-30 23:37:14 +01:00
Clément Bœsch
949506191a lavf/subtitles: fix CLRF/CRLF typo. 2012-12-30 23:14:34 +01:00
Clément Bœsch
725d6c615c Add MPlayer subtitles demuxer. 2012-12-30 23:09:49 +01:00
Clément Bœsch
d9ac8d2967 lavf: move srtdec:read_chunk() to subtitles utils. 
This function can be useful for various other subtitles formats.
 2012-12-30 22:58:58 +01:00
Clément Bœsch
67286fa98b 10l: export ff_bprint_to_extradata between libs using avpriv_ prefix. 
Both libavformat and libavcodec requires this function.
 2012-12-30 22:54:56 +01:00
Clément Bœsch
5c68aae908 Add VPlayer subtitles demuxer and decoder. 
Note that the linebreaks text codec option (but not the feature) has
been removed; its main goal was to allow demuxers to configure the text
decoder (and not meant to be used by users), but the AVOption are not a
viable solution. This is solved differently in this commit.
 2012-12-30 22:46:42 +01:00
Clément Bœsch
5f02844c8d Add MPL2 subtitles demuxer and decoder. 2012-12-30 22:37:25 +01:00
Clément Bœsch
36e61e24e7 lavc: add ff_bprint_to_extradata() helper and use it. 
This commit also makes sure the extradata and subtitle_header are NUL
terminated, without taking into account the trailing '\0' in account in
the size.

At the same time, it should fix 'warning: dereferencing type-punned
pointer will break strict-aliasing rules' warning for compilers who
don't consider uint8_t** and char** compatibles.
 2012-12-30 22:19:04 +01:00
Clément Bœsch
3af3a3006f lavf/srtdec: remove line break hack. 
This is not necessary anymore since the last commit.
 2012-12-30 21:39:35 +01:00
Michael Niedermayer
384dd9804d Merge commit '30a76487304e7250294c9c0e9fa179bf07fd822a' 
* commit '30a76487304e7250294c9c0e9fa179bf07fd822a':
  hlsenc: make segment number unsigned
  hlsenc: make EXT-X-MEDIA-SEQUENCE always increase

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-30 14:21:55 +01:00
Michael Niedermayer
56c71cd599 Merge commit '9b1370aced385698bc783747917544ab69ecb373' 
* commit '9b1370aced385698bc783747917544ab69ecb373':
  hlsenc: do not add timestamps in different timebases
  hlsenc: use the correct AV_TIME_BASE macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-30 14:11:17 +01:00
Michael Niedermayer
19e1c8e4f2 Merge commit '0448f26c97c5ab4858d31e456a4f1738ae783242' 
* commit '0448f26c97c5ab4858d31e456a4f1738ae783242':
  hlsenc: keep the playlist to the correct number of items
  hlsenc: use the segment filename in the playlist entry

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-30 14:02:19 +01:00
Michael Niedermayer
2ce43b37fc Merge commit '6dd93ee6f1b050ad7c4b247899e83efa293ee405' 
* commit '6dd93ee6f1b050ad7c4b247899e83efa293ee405':
  hlsenc: check append_entry return value
  hlsenc: use the basename to generate the list entries
  avstring: add av_basename and av_dirname

Conflicts:
	Changelog
	doc/APIchanges
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-30 13:54:50 +01:00
Clément Bœsch
613001d75f Merge back some registering macros in all*.c. 
This breaks the sed in configure:find_things(). Fixes regression from
c73c87b. Fixes Ticket2079.

Found-by: jamal
 2012-12-30 07:18:21 +01:00
Dave Yeo
925c9f444f Fix OS/2 threading 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-29 18:56:33 +01:00
James Almer
d59d39e164 wavdec: fix duration calculation for files with invalid data size 
Some wav files report a data size that is bigger than the actual file size.
Fall back to estimation from bitrate in such cases.

Fixes ticket #2065.

Signed-off-by: James Almer <jamrial@gmail.com>
 2012-12-29 17:46:01 +00:00
Luca Barbato
30a7648730 hlsenc: make segment number unsigned 
It will overflow if somebody keeps streaming for a time long enough.
 2012-12-29 17:26:30 +01:00
Luca Barbato
9b1370aced hlsenc: do not add timestamps in different timebases 
start_time is in stream timebase units while end_time is
in AV_TIME_BASE ones.
 2012-12-29 17:26:30 +01:00
Luca Barbato
0448f26c97 hlsenc: keep the playlist to the correct number of items 
Consider the corner case with a list size larger than the wrap
number.
 2012-12-29 17:26:30 +01:00
Kanglin
27a15e0af6 hlsenc: make EXT-X-MEDIA-SEQUENCE always increase 2012-12-29 17:26:30 +01:00
Kanglin
0d8cc7a3b2 hlsenc: use the correct AV_TIME_BASE macro 
recording_time is in AV_TIME_BASE units.
 2012-12-29 17:26:30 +01:00
Luca Barbato
6dd93ee6f1 hlsenc: check append_entry return value 2012-12-29 17:26:29 +01:00
Luca Barbato
ae85d6c9c0 hlsenc: use the segment filename in the playlist entry 
Avoid calling av_get_frame_filename twice, once to generate the
segment filename and once to generate the playlist.
 2012-12-29 17:26:29 +01:00
Luca Barbato
66f7b4862f hlsenc: use the basename to generate the list entries 
The segment path is desumed from the playlist path, recording a
relative path in the playlist while serving the file could lead
to misleading results.
 2012-12-29 17:26:29 +01:00
Michael Niedermayer
83d4a8442c Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  cosmetics: Prettyprint codec/format/filter registration files

Conflicts:
	libavcodec/allcodecs.c
	libavdevice/alldevices.c
	libavfilter/allfilters.c
	libavformat/allformats.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-29 14:27:38 +01:00
Michael Niedermayer
2a9443a110 Merge commit '69583bd3b1eba471366141c945030c163e073e02' 
* commit '69583bd3b1eba471366141c945030c163e073e02':
  avfilter: Refactor unconditional filter registration
  build: Add rtpenc_chain extra config option
  configure: Add --disable-all command line option

Conflicts:
	libavfilter/allfilters.c
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-29 13:05:37 +01:00
Paul B Mahol
3f8ee30e63 mmfenc: use ff_raw_write_packet() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-28 22:21:56 +00:00
Paul B Mahol
f18d2137d6 aiffenc: use ff_raw_write_packet() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-28 22:06:39 +00:00
Paul B Mahol
8ad010a7e0 soxenc: use ff_raw_write_packet() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-28 21:58:03 +00:00
Paul B Mahol
a4b62f36c7 soxdec: use meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-28 21:50:42 +00:00
Paul B Mahol
09401694db soxenc: use ffio_fill 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-28 21:48:07 +00:00
Paul B Mahol
a4912aa61e soxenc: use FFALIGN 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-28 21:37:08 +00:00
Diego Biurrun
c73c87b412 cosmetics: Prettyprint codec/format/filter registration files 2012-12-28 19:18:13 +01:00
Diego Biurrun
5ad2f0bfb2 build: Add rtpenc_chain extra config option 
Also fixes linking in various configs with only individual parts enabled
because the RTP muxer chaining code depends on the general RTP code,
which is now accounted for.
 2012-12-28 19:18:13 +01:00
Paul B Mahol
507956824c auenc: do not write invalid file size 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-28 16:29:22 +00:00
Stefano Sabatini
0156dd6530 lavf/segment: add segment_frames option 
This is meant to address trac ticket #1483.
 2012-12-28 11:17:22 +01:00
Stefano Sabatini
7a8face9fb lavf/segment: add reference_stream option 2012-12-28 10:57:02 +01:00
Jean First
7fc73d9ab7 rmdec: fix compiler warning for uninitialized variables 
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 23:54:34 +01:00
XBMC
4c41fc88df mpegts: update AVProgram after pmt change 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 20:30:36 +01:00
Tomas Härdin
928727f951 mxfdec: Rescale audio stream duration from EditRate to SampleRate 
Since 83cab07 audio stream time bases are based on SampleRate, not EditRate.
This fixes trac ticket #2029 and a few seeking issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 17:45:34 +01:00
Michael Niedermayer
1be8d0fbda srt_probe: make buffer pointer const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 02:57:48 +01:00
Michael Niedermayer
f89f3d4a98 str_probe: make buffer related pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:55:22 +01:00
Michael Niedermayer
28b9099ac1 pva_probe: make buffer related pointers and function arguments const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:54:41 +01:00
Michael Niedermayer
59693ed96c mxf_probe: make buffer related pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:54:20 +01:00
Michael Niedermayer
c8e5efb496 mpc8_probe: make buffer related pointers and function arguments const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:51:59 +01:00
Michael Niedermayer
7a84664ffe mp3_read_probe: make buffer related pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:51:32 +01:00
Michael Niedermayer
9d95deef61 microdvd_probe: make buffer pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:50:58 +01:00
Michael Niedermayer
c3cb338955 mpegps_probe: make buffer related pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:50:14 +01:00
Michael Niedermayer
e1f9432644 loas_probe: make buffer pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:45:56 +01:00
Michael Niedermayer
29397c99e0 lmlm4_probe: make buffer pointers const 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-25 01:45:43 +01:00