* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include <stdint.h>
#include <stdlib.h>
#include <stdio.h>
-#include "avformat.h"
+#include "libavutil/common.h"
+#include "libavformat/avformat.h"
#undef exit
+#undef printf
+#undef fprintf
int main(int argc, char **argv)
{
AVFormatContext *ic;
int i, ret, stream_id;
int64_t timestamp;
+ AVFormatParameters params, *ap= ¶ms;
+ memset(ap, 0, sizeof(params));
+ ap->channels=1;
+ ap->sample_rate= 22050;
/* initialize libavcodec, and register all codecs and formats */
av_register_all();
filename = argv[1];
/* allocate the media context */
- ic = av_alloc_format_context();
+ ic = avformat_alloc_context();
if (!ic) {
fprintf(stderr, "Memory error\n");
exit(1);
}
- ret = av_open_input_file(&ic, filename, NULL, 0, NULL);
+ ret = av_open_input_file(&ic, filename, NULL, 0, ap);
if (ret < 0) {
- fprintf(stderr, "cant open %s\n", filename);
+ fprintf(stderr, "cannot open %s\n", filename);
exit(1);
}
for(i=0; ; i++){
AVPacket pkt;
- AVStream *st;
+ AVStream *av_uninit(st);
memset(&pkt, 0, sizeof(pkt));
if(ret>=0){
printf("ret:%2d", ret);
if(ret>=0){
st= ic->streams[pkt.stream_index];
- printf(" st:%2d dts:%f pts:%f pos:%Ld size:%d flags:%d", pkt.stream_index, pkt.dts*av_q2d(st->time_base), pkt.pts*av_q2d(st->time_base), pkt.pos, pkt.size, pkt.flags);
+ printf(" st:%2d dts:%f pts:%f pos:%" PRId64 " size:%d flags:%d", pkt.stream_index, pkt.dts*av_q2d(st->time_base), pkt.pts*av_q2d(st->time_base), pkt.pos, pkt.size, pkt.flags);
}
printf("\n");
}
st= ic->streams[stream_id];
timestamp= av_rescale_q(timestamp, AV_TIME_BASE_Q, st->time_base);
}
- ret = av_seek_frame(ic, stream_id, timestamp, (i&1)*AVSEEK_FLAG_BACKWARD);
+ //FIXME fully test the new seek API
+ if(i&1) ret = avformat_seek_file(ic, stream_id, INT64_MIN, timestamp, timestamp, 0);
+ else ret = avformat_seek_file(ic, stream_id, timestamp, timestamp, INT64_MAX, 0);
printf("ret:%2d st:%2d ts:%f flags:%d\n", ret, stream_id, timestamp*(stream_id<0 ? 1.0/AV_TIME_BASE : av_q2d(st->time_base)), i&1);
}