eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 01:40:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2012-03-25 01:56:53 +01:00
parent f4c380a5e6 d5ed5e7d0c
commit 8bf95e8bd5
10 changed files with 85 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libavformat/movenc.c
View File

@@ -2158,26 +2158,6 @@ static void param_write_hex(AVIOContext *pb, const char *name, const uint8_t *va
avio_printf(pb, "<param name=\"%s\" value=\"%s\" valuetype=\"data\"/>\n", name, buf);
}
static void write_h264_extradata(AVIOContext *pb, AVCodecContext *enc)
{
uint16_t sps_size, pps_size, len;
char buf[150];
sps_size = AV_RB16(&enc->extradata[6]);
if (11 + sps_size > enc->extradata_size)
return;
pps_size = AV_RB16(&enc->extradata[9 + sps_size]);
if (11 + sps_size + pps_size > enc->extradata_size)
return;
len = FFMIN(sizeof(buf)/2 - 1, sps_size);
ff_data_to_hex(buf, &enc->extradata[8], len, 0);
buf[2*len] = '\0';
avio_printf(pb, "<param name=\"CodecPrivateData\" value=\"00000001%s", buf);
len = FFMIN(sizeof(buf)/2 - 1, pps_size);
ff_data_to_hex(buf, &enc->extradata[11 + sps_size], len, 0);
buf[2*len] = '\0';
avio_printf(pb, "00000001%s\" valuetype=\"data\"/>\n", buf);
}
static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov)
{
int64_t pos = avio_tell(pb);
@@ -2219,10 +2199,16 @@ static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov)
param_write_int(pb, "systemBitrate", track->enc->bit_rate);
param_write_int(pb, "trackID", track_id);
if (track->enc->codec_type == AVMEDIA_TYPE_VIDEO) {
if (track->enc->codec_id == CODEC_ID_H264 &&
track->enc->extradata_size >= 11 &&
track->enc->extradata[0] == 1) {
write_h264_extradata(pb, track->enc);
if (track->enc->codec_id == CODEC_ID_H264) {
uint8_t *ptr;
int size = track->enc->extradata_size;
if (!ff_avc_write_annexb_extradata(track->enc->extradata, &ptr,
&size)) {
param_write_hex(pb, "CodecPrivateData",
ptr ? ptr : track->enc->extradata,
size);
av_free(ptr);
}
} else {
param_write_hex(pb, "CodecPrivateData", track->enc->extradata,
track->enc->extradata_size);