Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2015-09-16 07:46:50 +0300
committerJames Almer <jamrial@gmail.com>2015-09-17 17:36:16 +0300
commit655b6dcb34b25d591e15ede17673ea6cb8074711 (patch)
tree6a31b795fb22a327663b7643ea49abc9bbb55a2d /libavformat/rdt.c
parent245bf7c18a71fa3800bb4c3fcea5e08ba90b4f2c (diff)
lavc/lavf: remove incompatible abi checks for the new 64bit fields
Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/rdt.c')
-rw-r--r--libavformat/rdt.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/libavformat/rdt.c b/libavformat/rdt.c
index 0e6ac8ec76..c3ac19852f 100644
--- a/libavformat/rdt.c
+++ b/libavformat/rdt.c
@@ -448,11 +448,7 @@ real_parse_asm_rule(AVStream *st, const char *p, const char *end)
{
do {
/* can be either averagebandwidth= or AverageBandwidth= */
-#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
- if (sscanf(p, " %*1[Aa]verage%*1[Bb]andwidth=%d", &st->codec->bit_rate) == 1)
-#else
if (sscanf(p, " %*1[Aa]verage%*1[Bb]andwidth=%"SCNd64, &st->codec->bit_rate) == 1)
-#endif
break;
if (!(p = strchr(p, ',')) || p > end)
p = end;