aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/seek-test.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-10-29 02:08:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-10-29 02:08:54 +0200
commit6faf0a21e18f314c48a886864145abe715be6572 (patch)
treef67c3e543a8b2c3283875881536d0a69da515e5e /libavformat/seek-test.c
parented1aa8921749a1c70d4453326da7f7b5a6f6f6e7 (diff)
parent61856d06eb30955290911140e6745bad93a25323 (diff)
downloadffmpeg-6faf0a21e18f314c48a886864145abe715be6572.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: (53 commits) probe: Restore identification of files with very large id3 tags and no extension. probe: Remove id3 tag presence as a criteria to do file extension checking. mpegts: MP4 SL support mpegts: MP4 OD support mpegts: Add support for Sections in PMT mpegts: Replace the MP4 descriptor parser with a recursive parser. mpegts: Add support for multiple mp4 descriptors mpegts: Parse mpeg2 SL descriptors. isom: Add MPEG4SYSTEMS dummy object type indication. aacdec: allow output reconfiguration on channel changes nellymoserenc: take float input samples instead of int16 nellymoserdec: use dsp functions for overlap and windowing nellymoserdec: do not fail if there is extra data in the packet nellymoserdec: fail if output buffer is too small nellymoserdec: remove pointless buffer size check. lavf: add init_put_byte() to the list of visible symbols. seek-test: free options dictionary after use snow: do not draw_edge if emu_edge is set tools/pktdumper: update to recent avformat api seek-test: update to recent avformat api ... Conflicts: doc/APIchanges libavcodec/mpegaudiodec.c libavcodec/nellymoserdec.c libavcodec/snow.c libavcodec/version.h libavcodec/wmadec.c libavformat/avformat.h libavformat/mpegts.c libavformat/mxfdec.c libavformat/utils.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/seek-test.c')
-rw-r--r--libavformat/seek-test.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/libavformat/seek-test.c b/libavformat/seek-test.c
index cea36cabb2..3a448cfe3b 100644
--- a/libavformat/seek-test.c
+++ b/libavformat/seek-test.c
@@ -64,10 +64,10 @@ int main(int argc, char **argv)
AVFormatContext *ic = NULL;
int i, ret, stream_id;
int64_t timestamp;
- AVFormatParameters params, *ap= &params;
- memset(ap, 0, sizeof(params));
- ap->channels=1;
- ap->sample_rate= 22050;
+ AVDictionary *format_opts = NULL;
+
+ av_dict_set(&format_opts, "channels", "1", 0);
+ av_dict_set(&format_opts, "sample_rate", "22050", 0);
/* initialize libavcodec, and register all codecs and formats */
av_register_all();
@@ -80,7 +80,8 @@ int main(int argc, char **argv)
filename = argv[1];
- ret = av_open_input_file(&ic, filename, NULL, 0, ap);
+ ret = avformat_open_input(&ic, filename, NULL, &format_opts);
+ av_dict_free(&format_opts);
if (ret < 0) {
fprintf(stderr, "cannot open %s\n", filename);
exit(1);