diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 12:41:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 12:41:34 +0100 |
| commit | a9ddb624890dd8c334617239793e63d93fbd52ee (patch) | |
| tree | d1b6919c46a238f1a9c926106cddb0d283badd60 /libavformat/bethsoftvid.c | |
| parent | fa92ee821bba1d3c2a497ed22e41927b552856f8 (diff) | |
| parent | 1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e (diff) | |
| download | ffmpeg-a9ddb624890dd8c334617239793e63d93fbd52ee.tar.gz | |
Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'
* commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e':
avformat: av_log_ask_for_sample() ---> avpriv_request_sample()
Conflicts:
libavformat/mxfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/bethsoftvid.c')
| -rw-r--r-- | libavformat/bethsoftvid.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/bethsoftvid.c b/libavformat/bethsoftvid.c index caff7abf3f..b8f08c1f87 100644 --- a/libavformat/bethsoftvid.c +++ b/libavformat/bethsoftvid.c @@ -108,8 +108,9 @@ static int read_frame(BVID_DemuxContext *vid, AVIOContext *pb, AVPacket *pkt, return AVERROR(ENOMEM); vid->video_index = st->index; if (vid->audio_index < 0) { - av_log_ask_for_sample(s, "No audio packet before first video " - "packet. Using default video time base.\n"); + avpriv_request_sample(s, "Using default video time base since " + "having no audio packet before the first " + "video packet"); } avpriv_set_pts_info(st, 64, 185, vid->sample_rate); st->codec->codec_type = AVMEDIA_TYPE_VIDEO; |