mirror of https://git.ffmpeg.org/ffmpeg.git
Compare commits
3 Commits
1b41631185
...
cdf71f789b
Author | SHA1 | Date |
---|---|---|
Martin Storsjö | cdf71f789b | |
James Almer | ce33a5f16d | |
James Almer | 63702d5f9c |
30
.travis.yml
30
.travis.yml
|
@ -1,30 +0,0 @@
|
|||
language: c
|
||||
sudo: false
|
||||
os:
|
||||
- linux
|
||||
- osx
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
- nasm
|
||||
- diffutils
|
||||
compiler:
|
||||
- clang
|
||||
- gcc
|
||||
matrix:
|
||||
exclude:
|
||||
- os: osx
|
||||
compiler: gcc
|
||||
cache:
|
||||
directories:
|
||||
- ffmpeg-samples
|
||||
before_install:
|
||||
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
|
||||
install:
|
||||
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install nasm; fi
|
||||
script:
|
||||
- mkdir -p ffmpeg-samples
|
||||
- ./configure --samples=ffmpeg-samples --cc=$CC
|
||||
- make -j 8
|
||||
- make fate-rsync
|
||||
- make check -j 8
|
|
@ -75,13 +75,13 @@ enum CouplingPoint {
|
|||
union { \
|
||||
int RENAME_FIXED(name) elems; \
|
||||
float name elems; \
|
||||
};
|
||||
}
|
||||
|
||||
#define INTFLOAT_ALIGNED_UNION(alignment, name, nb_elems) \
|
||||
union { \
|
||||
DECLARE_ALIGNED(alignment, int, RENAME_FIXED(name))[nb_elems]; \
|
||||
DECLARE_ALIGNED(alignment, float, name)[nb_elems]; \
|
||||
};
|
||||
}
|
||||
/**
|
||||
* Long Term Prediction
|
||||
*/
|
||||
|
|
|
@ -6672,6 +6672,7 @@ static int mov_write_subtitle_end_packet(AVFormatContext *s,
|
|||
#if CONFIG_IAMFENC
|
||||
static int mov_build_iamf_packet(AVFormatContext *s, MOVTrack *trk, AVPacket *pkt)
|
||||
{
|
||||
uint8_t *data;
|
||||
int ret;
|
||||
|
||||
if (pkt->stream_index == trk->first_iamf_idx) {
|
||||
|
@ -6685,40 +6686,34 @@ static int mov_build_iamf_packet(AVFormatContext *s, MOVTrack *trk, AVPacket *pk
|
|||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
if (pkt->stream_index == trk->last_iamf_idx) {
|
||||
uint8_t *data;
|
||||
if (pkt->stream_index != trk->last_iamf_idx)
|
||||
return AVERROR(EAGAIN);
|
||||
|
||||
ret = avio_close_dyn_buf(trk->iamf_buf, &data);
|
||||
trk->iamf_buf = NULL;
|
||||
|
||||
if (!ret) {
|
||||
if (pkt->size) {
|
||||
// Either all or none of the packets for a single
|
||||
// IA Sample may be empty.
|
||||
av_log(s, AV_LOG_ERROR, "Unexpected packet from "
|
||||
"stream #%d\n", pkt->stream_index);
|
||||
ret = AVERROR_INVALIDDATA;
|
||||
}
|
||||
av_free(data);
|
||||
return ret;
|
||||
ret = avio_close_dyn_buf(trk->iamf_buf, &data);
|
||||
trk->iamf_buf = NULL;
|
||||
if (!ret) {
|
||||
if (pkt->size) {
|
||||
// Either all or none of the packets for a single
|
||||
// IA Sample may be empty.
|
||||
av_log(s, AV_LOG_ERROR, "Unexpected packet from "
|
||||
"stream #%d\n", pkt->stream_index);
|
||||
ret = AVERROR_INVALIDDATA;
|
||||
}
|
||||
av_buffer_unref(&pkt->buf);
|
||||
pkt->buf = av_buffer_create(data, ret, NULL, NULL, 0);
|
||||
if (!pkt->buf) {
|
||||
av_free(data);
|
||||
return AVERROR(ENOMEM);
|
||||
}
|
||||
pkt->data = data;
|
||||
pkt->size = ret;
|
||||
pkt->stream_index = trk->first_iamf_idx;
|
||||
av_free(data);
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = avio_open_dyn_buf(&trk->iamf_buf);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
} else
|
||||
ret = AVERROR(EAGAIN);
|
||||
av_buffer_unref(&pkt->buf);
|
||||
pkt->buf = av_buffer_create(data, ret, NULL, NULL, 0);
|
||||
if (!pkt->buf) {
|
||||
av_free(data);
|
||||
return AVERROR(ENOMEM);
|
||||
}
|
||||
pkt->data = data;
|
||||
pkt->size = ret;
|
||||
pkt->stream_index = trk->first_iamf_idx;
|
||||
|
||||
return ret;
|
||||
return avio_open_dyn_buf(&trk->iamf_buf);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue