virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  mpegts: Remove disabled extension matching probe.
  fate: avoid freopen(NULL) in videogen/rotozoom

Conflicts:
	tests/rotozoom.c
	tests/videogen.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-06-07 21:45:52 +02:00
parent b4d44367bc a8656cd425
commit 67732b9d62
4 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/mpegts.c
View File

@@ -1868,7 +1868,6 @@ static int handle_packets(MpegTSContext *ts, int nb_packets)
static int mpegts_probe(AVProbeData *p) static int mpegts_probe(AVProbeData *p)
{ {
#if 1
const int size= p->buf_size; const int size= p->buf_size;
int score, fec_score, dvhs_score; int score, fec_score, dvhs_score;
int check_count= size / TS_FEC_PACKET_SIZE; int check_count= size / TS_FEC_PACKET_SIZE;
@@ -1887,13 +1886,6 @@ static int mpegts_probe(AVProbeData *p)
else if(dvhs_score > score && dvhs_score > fec_score && dvhs_score > 6) return AVPROBE_SCORE_MAX + dvhs_score - CHECK_COUNT; else if(dvhs_score > score && dvhs_score > fec_score && dvhs_score > 6) return AVPROBE_SCORE_MAX + dvhs_score - CHECK_COUNT;
else if( fec_score > 6) return AVPROBE_SCORE_MAX + fec_score - CHECK_COUNT; else if( fec_score > 6) return AVPROBE_SCORE_MAX + fec_score - CHECK_COUNT;
else return -1; else return -1;
#else
/* only use the extension for safer guess */
if (av_match_ext(p->filename, "ts"))
return AVPROBE_SCORE_MAX;
else
return 0;
#endif
} }
/* return the 90kHz PCR and the extension for the 27MHz PCR. return /* return the 90kHz PCR and the extension for the 27MHz PCR. return

4
tests/Makefile
View File

@@ -28,10 +28,10 @@ tests/data/asynth-%.wav: tests/audiogen$(HOSTEXESUF) | tests/data
$(M)./$< $@ $(subst -, ,$*) $(M)./$< $@ $(subst -, ,$*)
tests/data/vsynth1.yuv: tests/videogen$(HOSTEXESUF) | tests/data tests/data/vsynth1.yuv: tests/videogen$(HOSTEXESUF) | tests/data
$(M)$< >$@ $(M)$< $@
tests/data/vsynth2.yuv: tests/rotozoom$(HOSTEXESUF) | tests/data tests/data/vsynth2.yuv: tests/rotozoom$(HOSTEXESUF) | tests/data
$(M)$< $(SRC_PATH)/tests/lena.pnm >$@ $(M)$< $(SRC_PATH)/tests/lena.pnm $@
tests/data/%.sw tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm: TAG = GEN tests/data/%.sw tests/data/asynth% tests/data/vsynth%.yuv tests/vsynth%/00.pgm: TAG = GEN

11
tests/rotozoom.c
View File

@@ -158,15 +158,16 @@ int main(int argc, char **argv)
{ {
int w, h, i; int w, h, i;
char buf[1024]; char buf[1024];
int isdir = 0;
if (argc > 3) { if (argc != 3) {
printf("usage: %s image.pnm [directory/]\n" printf("usage: %s image.pnm file|dir\n"
"generate a test video stream\n", argv[0]); "generate a test video stream\n", argv[0]);
return 1; return 1;
} }
// if (argc < 3) if (!freopen(argv[2], "wb", stdout))
// err_if(!freopen(NULL, "wb", stdout)); isdir = 1;
w = DEFAULT_WIDTH; w = DEFAULT_WIDTH;
h = DEFAULT_HEIGHT; h = DEFAULT_HEIGHT;
@@ -181,7 +182,7 @@ int main(int argc, char **argv)
for (i = 0; i < DEFAULT_NB_PICT; i++) { for (i = 0; i < DEFAULT_NB_PICT; i++) {
gen_image(i, w, h); gen_image(i, w, h);
if (argc > 2) { if (isdir) {
snprintf(buf, sizeof(buf), "%s%02d.pgm", argv[2], i); snprintf(buf, sizeof(buf), "%s%02d.pgm", argv[2], i);
pgmyuv_save(buf, w, h, rgb_tab); pgmyuv_save(buf, w, h, rgb_tab);
} else { } else {

11
tests/videogen.c
View File

@@ -145,15 +145,16 @@ int main(int argc, char **argv)
{ {
int w, h, i; int w, h, i;
char buf[1024]; char buf[1024];
int isdir = 0;
if (argc > 2) { if (argc != 2) {
printf("usage: %s [file]\n" printf("usage: %s file|dir\n"
"generate a test video stream\n", argv[0]); "generate a test video stream\n", argv[0]);
exit(1); exit(1);
} }
// if (argc < 2) if (!freopen(argv[1], "wb", stdout))
// err_if(!freopen(NULL, "wb", stdout)); isdir = 1;
w = DEFAULT_WIDTH; w = DEFAULT_WIDTH;
h = DEFAULT_HEIGHT; h = DEFAULT_HEIGHT;
@@ -165,7 +166,7 @@ int main(int argc, char **argv)
for (i = 0; i < DEFAULT_NB_PICT; i++) { for (i = 0; i < DEFAULT_NB_PICT; i++) {
gen_image(i, w, h); gen_image(i, w, h);
if (argc > 1) { if (isdir) {
snprintf(buf, sizeof(buf), "%s%02d.pgm", argv[1], i); snprintf(buf, sizeof(buf), "%s%02d.pgm", argv[1], i);
pgmyuv_save(buf, w, h, rgb_tab); pgmyuv_save(buf, w, h, rgb_tab);
} else { } else {