falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge remote-tracking branch 'qatar/master' 

* qatar/master:
  libmp3lame: add ABR support

Conflicts:
	libavcodec/libmp3lame.c
	libavcodec/version.h

See: d3211cfaed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.3
Michael Niedermayer 12 years ago
parent
e4fc7e3d4d 09fda6bb50
commit
75621cdf5d
1 changed files with 1 additions and 1 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      libavcodec/version.h

+ 1
- 1
libavcodec/version.h View File

@@ -30,7 +30,7 @@

#define LIBAVCODEC_VERSION_MAJOR 55
#define LIBAVCODEC_VERSION_MINOR 55
#define LIBAVCODEC_VERSION_MICRO 105
#define LIBAVCODEC_VERSION_MICRO 106

#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \


Write Preview
Loading…
Cancel
Save