b8d3f7fc21
Merge commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95'
...
* commit 'a2efbecc4ed12d287cf29856418c4da4a7648d95':
libavformat: Move avc mp4 startcode parsing to a shared file
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-25 00:09:42 +02:00
a2efbecc4e
libavformat: Move avc mp4 startcode parsing to a shared file
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-09-24 23:33:17 +03:00
8bf95e8bd5
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avc: Add a function for converting mp4 style extradata to annex b
pthread: free progress if buffer allocation failed.
lavc/avconv: support changing frame sizes in codecs with frame mt.
libavformat: Document who sets the AVStream.id field
utvideo: mark output picture as keyframe.
sunrast: Add support for negative linesize.
vp8: fix update_lf_deltas in libavcodec/vp8.c
ralf: read Huffman code lengths without GetBitContext
Conflicts:
ffmpeg.c
libavcodec/sunrastenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-25 01:56:53 +01:00
d5ed5e7d0c
avc: Add a function for converting mp4 style extradata to annex b
...
Make movenc use this function instead of the current custom
conversion function.
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-03-24 22:53:18 +02:00
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
471fe57e1a
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd
2011-02-20 19:05:47 +01:00
ae628ec1fd
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 08:37:15 -05:00
c844520e73
10l, fix prototype
...
Originally committed as revision 16625 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-16 01:20:31 +00:00
d298412062
export ff_avc_parse_nal_units_buf
...
Originally committed as revision 16624 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-16 01:17:18 +00:00
a97772b166
return size written in ff_avc_parse_nal_units
...
Originally committed as revision 16622 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-16 01:11:34 +00:00
0a63a676ec
Do not reallocate AVPacket's data when muxing a packet
...
Originally committed as revision 16616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-15 14:03:07 +00:00
987903826b
Globally rename the header inclusion guard names.
...
Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.' to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".
Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:39:47 +00:00
9d2526d1b9
Add missing FFMPEG_ prefix to multiple inclusion guard.
...
Originally committed as revision 15047 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 07:17:36 +00:00
d937cd0ed2
const
...
Originally committed as revision 12145 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-19 16:08:52 +00:00
b973f9ad7e
Make avc_find_startcode non-static, so that it can be used from other
...
files (and add the ff_ prefix, to avoid polluting the namespace)
Originally committed as revision 11532 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-15 08:05:58 +00:00
9ab3f71b60
add a ff_ prefix to newly exported functions from avc.c
...
Originally committed as revision 11511 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 23:33:32 +00:00
1bd2d763d4
Move isom_write_avcc() and related functions into a separate file.
...
Originally committed as revision 11498 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 01:24:55 +00:00
Michael Niedermayer
Martin Storsjö
Mans Rullgard
Anton Khirnov
Baptiste Coudurier
Luca Abeni
Stefano Sabatini
Diego Biurrun
Aurelien Jacobs