summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-08-04 18:59:03 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-08-10 17:22:56 +0200
commitf9f11c10005ec070faf2af5af945bb52fda04819 (patch)
tree2a9748fb4e97821a563b5f58106503663e1f63be /libavformat
parentb2bc48ae22969256334988238f284c78e73c89e4 (diff)
lavf: return APIC fourcc from query_format() if the codec is supported as an attachment pic
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/avformat.h1
-rw-r--r--libavformat/version.h4
2 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 150af3f988..cd8884d02f 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -434,6 +434,7 @@ typedef struct AVOutputFormat {
*
* @return 1 if the codec is supported, 0 if it is not.
* A negative number if unknown.
+ * MKTAG('A', 'P', 'I', 'C') if the codec is only supported as AV_DISPOSITION_ATTACHED_PIC
*/
int (*query_codec)(enum AVCodecID id, int std_compliance);
diff --git a/libavformat/version.h b/libavformat/version.h
index 750b7652e2..99a8ddfdb8 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -30,8 +30,8 @@
#include "libavutil/avutil.h"
#define LIBAVFORMAT_VERSION_MAJOR 54
-#define LIBAVFORMAT_VERSION_MINOR 22
-#define LIBAVFORMAT_VERSION_MICRO 104
+#define LIBAVFORMAT_VERSION_MINOR 23
+#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \